[libreoffice] 03/09: remove upstreamed patch

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_4.4.6_rc3-0ubuntu1
in repository libreoffice.

commit b78972a00602ddcb50d2294facbd826279cd1f2c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 15 12:05:04 2015 +0200

    remove upstreamed patch
---
 patches/g_strdup_printf_format.diff | 13 ----------
 patches/lp-1418551.diff             | 50 -------------------------------------
 patches/series                      |  2 --
 3 files changed, 65 deletions(-)

diff --git a/patches/g_strdup_printf_format.diff b/patches/g_strdup_printf_format.diff
deleted file mode 100644
index a79a0df..0000000
--- a/patches/g_strdup_printf_format.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
-index bc286d0..6a2d9c4 100644
---- a/vcl/unx/gtk/a11y/atktextattributes.cxx
-+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
-@@ -1235,7 +1235,7 @@ attribute_set_new_from_extended_attributes(
- 
-         pSet = attribute_set_prepend( pSet,
-                                       atk_text_attribute_register( sPropertyName.getStr() ),
--                                      g_strdup_printf( sPropertyValue.getStr() ) );
-+                                      g_strdup_printf( "%s", sPropertyValue.getStr() ) );
-     }
-     while ( nIndex >= 0 && nIndex < sExtendedAttrs.getLength() );
- 
diff --git a/patches/lp-1418551.diff b/patches/lp-1418551.diff
deleted file mode 100644
index 7a94eed..0000000
--- a/patches/lp-1418551.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From be88e305eeac88e51f83efc004d4b60b87f1e757 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl at redhat.com>
-Date: Tue, 12 May 2015 13:47:38 +0200
-Subject: tdf#90969: basic: add horrible hack to avoid crash due to ...
-
-... the stupid global variable GaDocBasicItems.
-
-Change-Id: Ib849e0e2b661e54005d00091f6d6fc474dc5549b
-
-diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
-index 559cb3c..a8f1bc6 100644
---- a/basic/source/classes/sb.cxx
-+++ b/basic/source/classes/sb.cxx
-@@ -24,6 +24,7 @@
- #include <tools/rcid.h>
- #include <tools/stream.hxx>
- #include <tools/errinf.hxx>
-+#include <tools/solarmutex.hxx>
- #include <basic/sbx.hxx>
- #include <tools/rc.hxx>
- #include <vcl/svapp.hxx>
-@@ -109,10 +110,22 @@ DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
- 
- DocBasicItem::~DocBasicItem()
- {
--    SolarMutexGuard g;
-+    // tdf#90969 HACK: don't use SolarMutexGuard - there is a horrible global
-+    // map GaDocBasicItems holding instances, and these get deleted from exit
-+    // handlers, when the SolarMutex is already dead
-+    tools::SolarMutex::Acquire();
- 
--    stopListening();
--    mxClassModules.Clear(); // release with SolarMutex locked
-+    try
-+    {
-+        stopListening();
-+        mxClassModules.Clear(); // release with SolarMutex locked
-+    }
-+    catch (...)
-+    {
-+        assert(false);
-+    }
-+
-+    tools::SolarMutex::Release();
- }
- 
- void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
--- 
-cgit v0.10.2
-
diff --git a/patches/series b/patches/series
index 9e896da..0968867 100644
--- a/patches/series
+++ b/patches/series
@@ -26,8 +26,6 @@ odk-no-dot.diff
 disable-icontest-build.diff
 hppa-is-32bit.diff
 gcj-no-bitness-check.diff
-g_strdup_printf_format.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 kubuntu_breeze-icons.diff
-lp-1418551.diff
 mailmerge-base.diff

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