[libreoffice] 79/152: remove upstreamed patches

[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 b39b1e4fd51d90e0d66eee59c09c4193f12034e0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 4 01:26:29 2016 +0200

    remove upstreamed patches
---
 patches/lp1569500.diff            | 28 ----------------------------
 patches/series                    |  2 --
 patches/unity-default-breeze.diff | 23 -----------------------
 3 files changed, 53 deletions(-)

diff --git a/patches/lp1569500.diff b/patches/lp1569500.diff
deleted file mode 100644
index 3041532..0000000
--- a/patches/lp1569500.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Wed, 27 Jan 2016 15:17:44 +0000
-Subject: [PATCH] Resolves: rhbz#1301346 crash with null ObjList
-
-Change-Id: Ia9446b06087907a2d9d1889ba7d4ccd1f78697d9
-
----
- svx/source/svdraw/svdedtv2.cxx | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
---- a/svx/source/svdraw/svdedtv2.cxx
-+++ b/svx/source/svdraw/svdedtv2.cxx
-@@ -484,8 +484,9 @@ void SdrEditView::ImpCheckToTopBtmPossible()
-     { // special-casing for single selection
-         SdrObject* pObj=GetMarkedObjectByIndex(0);
-         SdrObjList* pOL=pObj->GetObjList();
--        size_t nMax=pOL->GetObjCount();
--        size_t nMin=0;
-+        SAL_WARN_IF(!pOL, "svx", "Object somehow has no ObjList");
-+        size_t nMax = pOL ? pOL->GetObjCount() : 0;
-+        size_t nMin = 0;
-         const size_t nObjNum=pObj->GetOrdNum();
-         SdrObject* pRestrict=GetMaxToTopObj(pObj);
-         if (pRestrict!=nullptr) {
--- 
-2.5.0
-
diff --git a/patches/series b/patches/series
index fe0fabf..42a819c 100644
--- a/patches/series
+++ b/patches/series
@@ -28,5 +28,3 @@ gcj-no-bitness-check.diff
 rsc-no-error-about-unknown-switch.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
-unity-default-breeze.diff
-lp1569500.diff
diff --git a/patches/unity-default-breeze.diff b/patches/unity-default-breeze.diff
deleted file mode 100644
index 9f55150..0000000
--- a/patches/unity-default-breeze.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Tue, 20 Oct 2015 23:10:36 +0200
-Subject: [PATCH] on unity, default to breeze if possible
-
----
- vcl/source/app/IconThemeSelector.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
---- a/vcl/source/app/IconThemeSelector.cxx
-+++ b/vcl/source/app/IconThemeSelector.cxx
-@@ -66,7 +66,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
-         r = "breeze";
-     }
-     else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
--        r = "human";
-+        r = "breeze";
-     }
-     else {
-         r = FALLBACK_ICON_THEME_ID;
--- 
-2.5.0
-

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