[Libreoffice-commits] .: Branch 'libreoffice-3-5-4' - vcl/unx

[Bjoern Michaelsen]

 vcl/unx/gtk/window/gtkframe.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5ae02ce08a270ea7a5c0dd6d37d95a29be2cbbf0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun May 20 00:25:07 2012 +0200

    fdo#50173: fix Styles and Formatting gtk crasher
    
    - when using the gtk vcl plugin, pressing F11 in writer crashes
      libreoffice on some systems with an X error
    - related: fdo#46687
    
    Change-Id: I235cf327d812b606a357de859b1a959be728d2a1
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
    Signed-off-by: Lubos Lunak <l.lunak at suse.cz>

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 3488adb..c5df600 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3288,6 +3288,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
         XSetInputFocus( pThis->getDisplay()->GetDisplay(),
                         widget_get_xid(pWidget),
                         RevertToParent, CurrentTime );
+        XSync( pThis->getDisplay()->GetDisplay(), False );
         GetGenericData()->ErrorTrapPop();
     }
 #else