[libreoffice] 68/152: remove lp#1569589 patch for now -- needs more work

[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 68f2a831cd76f66508b8300b64164495d6ed1de4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Apr 14 14:23:39 2016 +0200

    remove lp#1569589 patch for now -- needs more work
---
 changelog              |  4 ++--
 patches/lp1569589.diff | 30 ------------------------------
 patches/series         |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/changelog b/changelog
index 175003a..60dfb42 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,11 @@
+
 libreoffice (1:5.1.2-0ubuntu2) xenial; urgency=medium
 
   * fix crash with nullptr SdrObjList (LP: #1569500)
-  * fix crash with ViewTabListBox_Impl living beyond VCL shutdown (LP: #1569589)
   * fix crash with ScCsvGrid living beyond VCL shutdown (LP: #1566050)
   * fix crash with non-empty BlendFrameCache in late VCL shutdown (LP: #1560328)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 13 Apr 2016 01:01:53 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 14 Apr 2016 14:22:04 +0200
 
 libreoffice (1:5.1.2-0ubuntu1) xenial; urgency=medium
 
diff --git a/patches/lp1569589.diff b/patches/lp1569589.diff
deleted file mode 100644
index 65d380e..0000000
--- a/patches/lp1569589.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Wed, 13 Apr 2016 00:07:56 +0200
-Subject: [PATCH] lp#1569589: a more honest attempt at disposing
- SvtFileView_Impl
-
-Dunno yet if that completely fixes the story -- the reference here are
-quite messy: ownership isnt exactly obvious.
-
-Change-Id: I54d71ac724590e85549bd152c963fdc8de46746e
-
----
- svtools/source/contnr/fileview.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
---- a/svtools/source/contnr/fileview.cxx
-+++ b/svtools/source/contnr/fileview.cxx
-@@ -1486,6 +1486,9 @@ SvtFileView_Impl::~SvtFileView_Impl()
- {
-     Clear();
-     mpView.disposeAndClear();
-+    mpCurView.clear();
-+    mpIconView.disposeAndClear();
-+    mpAntiImpl.clear();
- }
- 
- 
--- 
-2.5.0
-
diff --git a/patches/series b/patches/series
index 2244d15..52e6284 100644
--- a/patches/series
+++ b/patches/series
@@ -33,4 +33,3 @@ unity-default-breeze.diff
 lp1560328.diff
 lp1566050.diff
 lp1569500.diff
-lp1569589.diff

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