[libreoffice] 71/152: remove upstreamed lp1566050.diff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 09048c6f87af8f1f82bd26ce7ec2d7f474390a2d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 4 18:20:47 2016 +0200

    remove upstreamed lp1566050.diff
---
 patches/lp1566050.diff | 41 -----------------------------------------
 patches/series         |  1 -
 2 files changed, 42 deletions(-)

diff --git a/patches/lp1566050.diff b/patches/lp1566050.diff
deleted file mode 100644
index 363eb98..0000000
--- a/patches/lp1566050.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Tue, 12 Apr 2016 12:20:07 +0200
-Subject: [PATCH] lp#1566050: prevent cyclic reference zombies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-regression, likely from 2660d24a07866e083c5135ea263030f3e3a2e729:
-
-1/ Since that change mxAccessible in ScCsvGrid holds a rtl::Reference on
-a ScAccessibleCsvGrid
-2/ Which in turn holds a VclPtr<> (aka a rtl::Reference with lipstick)
-on the ScCsvControl
-
-These are a circular references, making both of them live forever and
-leak past the point where on LibreOffice close all of Vcl is long gone,
-when these are dtored. Clearing mxAccessible on disposing should help.
-
-Change-Id: Iebb2635ec4ea143e7f0dbfebad2e6141a68e72e8
-Reviewed-on: https://gerrit.libreoffice.org/24021
-Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
-Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
-
----
- sc/source/ui/dbgui/csvcontrol.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
---- a/sc/source/ui/dbgui/csvcontrol.cxx
-+++ b/sc/source/ui/dbgui/csvcontrol.cxx
-@@ -81,6 +81,7 @@ void ScCsvControl::dispose()
- {
-     if( mxAccessible.is() )
-         mxAccessible->dispose();
-+    mxAccessible = nullptr; // lp#1566050: prevent cyclic reference zombies
-     Control::dispose();
- }
- 
--- 
-2.5.0
-
diff --git a/patches/series b/patches/series
index ff4a379..9ab20bf 100644
--- a/patches/series
+++ b/patches/series
@@ -30,5 +30,4 @@ disable-npapi-plugin-support.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
 unity-default-breeze.diff
-lp1566050.diff
 lp1569500.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git