[libreoffice] 70/152: remove upstreamed lp1560328.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 18249a63602c780a13c10dd6ddefff48a567144a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 4 17:08:30 2016 +0200

    remove upstreamed lp1560328.diff
---
 patches/lp1560328.diff | 26 --------------------------
 patches/series         |  1 -
 2 files changed, 27 deletions(-)

diff --git a/patches/lp1560328.diff b/patches/lp1560328.diff
deleted file mode 100644
index 54506d4..0000000
--- a/patches/lp1560328.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Tue, 12 Apr 2016 23:23:51 +0200
-Subject: [PATCH] lp#1560328: clear cache before disposing rest of VCL
-
-Change-Id: Iac325cf934953c61cb4dbbb67cfbab1777dc45cc
-
----
- vcl/source/app/svmain.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
---- a/vcl/source/app/svmain.cxx
-+++ b/vcl/source/app/svmain.cxx
-@@ -335,6 +335,9 @@ VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */)
- void DeInitVCL()
- {
-     ImplSVData* pSVData = ImplGetSVData();
-+    // lp#1560328: clear cache before disposing rest of VCL
-+    if(pSVData->mpBlendFrameCache)
-+        pSVData->mpBlendFrameCache->m_aLastResult.Clear();
-     pSVData->mbDeInit = true;
- 
-     vcl::DeleteOnDeinitBase::ImplDeleteOnDeInit();
--- 
-2.5.0
-
diff --git a/patches/series b/patches/series
index 52e6284..ff4a379 100644
--- a/patches/series
+++ b/patches/series
@@ -30,6 +30,5 @@ disable-npapi-plugin-support.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
 unity-default-breeze.diff
-lp1560328.diff
 lp1566050.diff
 lp1569500.diff

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