[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 84be5a5ff23a6dc01d60f4233779ceaa61c30ba1
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit d62b46a09a6b5eba595182835c052b88a76ba5c8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 26 11:56:11 2011 +0200
lp#746375: backport of tentative patch
diff --git a/changelog b/changelog
index effee70..45d0c81 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.2-1ubuntu5~ppa1) natty; urgency=low
+
+ * tentative patch for lp#746375 (LP: #746375)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 26 Apr 2011 11:54:00 +0200
+
libreoffice (1:3.3.2-1ubuntu4) natty; urgency=low
* fix corrupted startcenter desktop file (LP: #765010)
diff --git a/patches/lp746375.diff b/patches/lp746375.diff
new file mode 100644
index 0000000..2f713c3
--- /dev/null
+++ b/patches/lp746375.diff
@@ -0,0 +1,60 @@
+Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply
+===================================================================
+--- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply 2011-04-26 11:45:52.645409871 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-26 11:46:15.645409868 +0200
+@@ -2380,3 +2380,6 @@
+
+ [ UbuntuOnly ]
+ lp720716.diff
++
++[ UbuntuOnly ]
++lp746375.diff
+--- /dev/null 2011-04-26 09:25:32.995411000 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/lp746375.diff 2011-04-26 11:39:39.085409921 +0200
+@@ -0,0 +1,46 @@
++From df71bb6970dc95a963ef2ea52f1f93f5f50325ed Mon Sep 17 00:00:00 2001
++From: Caolán McNamara <caolanm@redhat.com>
++Date: Wed, 13 Apr 2011 11:23:40 +0000
++Subject: Related: lp#746375 ensure a deterministic shutdown order for globals
++
++---
++diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
++index 68bb949..97e44e7 100644
++--- vcl/unx/gtk/a11y/atkutil.cxx
+++++ vcl/unx/gtk/a11y/atkutil.cxx
++@@ -66,7 +66,14 @@
++
++ using namespace ::com::sun::star;
++
++-static uno::WeakReference< accessibility::XAccessible > xNextFocusObject;
+++namespace
+++{
+++ struct theNextFocusObject :
+++ public rtl::Static< uno::WeakReference< accessibility::XAccessible >, theNextFocusObject>
+++ {
+++ };
+++}
+++
++ static guint focus_notify_handler = 0;
++
++ /*****************************************************************************/
++@@ -80,7 +87,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
++
++ focus_notify_handler = 0;
++
++- uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject;
+++ uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get();
++ if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) )
++ {
++ AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL;
++@@ -135,7 +142,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility:
++ if( focus_notify_handler )
++ g_source_remove(focus_notify_handler);
++
++- xNextFocusObject = xAccessible;
+++ theNextFocusObject::get() = xAccessible;
++
++ focus_notify_handler = g_idle_add (atk_wrapper_focus_idle_handler, xAccessible.get());
++ }
++--
++cgit v0.8.3-6-g21f6
diff --git a/patches/series b/patches/series
index 4c54d77..71ed117 100644
--- a/patches/series
+++ b/patches/series
@@ -16,3 +16,4 @@ disable-integrated-ubuntupatches.diff
fix-lo-desktop-pot.diff
fix-jpeg.diff
lp720716.diff
+lp746375.diff
--
LibreOffice packaging repository
Reply to: