[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-115-ge038aea
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit a848afd26e2fabc3d9923356622f2a9fb5fbc6fd
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Apr 20 09:13:57 2012 +0200
lp#975430 fdo#46687: backport find toolbar fix by Michael Meeks
diff --git a/patches/fdo-46687-fix-find-toolbar-X-error-handling.diff b/patches/fdo-46687-fix-find-toolbar-X-error-handling.diff
new file mode 100644
index 0000000..3f9c4a6
--- /dev/null
+++ b/patches/fdo-46687-fix-find-toolbar-X-error-handling.diff
@@ -0,0 +1,37 @@
+From 6d97ea37bba52b21648c91276bc9281d06cdd148 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks@suse.com>
+Date: Thu, 19 Apr 2012 14:34:35 +0100
+Subject: [PATCH] fdo#46687 - fix find toolbar X error handling
+
+---
+ vcl/unx/gtk/window/gtkframe.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
+index 4137a8d..a647bf8 100644
+--- a/vcl/unx/gtk/window/gtkframe.cxx
++++ b/vcl/unx/gtk/window/gtkframe.cxx
+@@ -2231,6 +2231,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
+ // to do this we need to synchronize with the XServer
+ GetGenericData()->ErrorTrapPush();
+ XSetInputFocus( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
++ // fdo#46687 - an XSync should not be necessary - but for some reason it is.
++ XSync( getDisplay()->GetDisplay(), False );
+ GetGenericData()->ErrorTrapPop();
+ }
+ #endif
+@@ -3239,9 +3241,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
+ #if !GTK_CHECK_VERSION(3,0,0)
+ if( bSetFocus )
+ {
++ GetGenericData()->ErrorTrapPush();
+ XSetInputFocus( pThis->getDisplay()->GetDisplay(),
+ widget_get_xid(pWidget),
+ RevertToParent, CurrentTime );
++ GetGenericData()->ErrorTrapPop();
+ }
+ #else
+ (void)pWidget; (void)bSetFocus;
+--
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index 60bf4b1..99826a3 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ ubuntu-quicklists.diff
fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
bypass-GtkSalPrinter-when-it-is-not-enabled.diff
lp-926940-visio-mime-for-draw.diff
+fdo-46687-fix-find-toolbar-X-error-handling.diff
--
LibreOffice packaging repository
Reply to: