[Libreoffice-commits] .: vcl/unx

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Mon May 21 07:06:18 PDT 2012


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

New commits:
commit 21f8ec1c49efd716669ca55ab946fadd5c97bb7e
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

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index eb77e75..36be0b2 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3248,6 +3248,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


More information about the Libreoffice-commits mailing list