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

Caolán McNamara caolanm at redhat.com
Fri Jun 23 20:13:42 UTC 2017


 vcl/unx/gtk3/gtk3gtkframe.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit c50ad28cea076d44c863c2b554d909235554cba0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 23 12:48:12 2017 +0100

    Resolves: tdf#108705 remove grabs on widget before destroying it
    
    Change-Id: If02a0b4340788db638c74b98e855258145643452
    Reviewed-on: https://gerrit.libreoffice.org/39166
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 54574dd1a38c..9b56adc2bdf5 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -838,6 +838,11 @@ GtkSalFrame::~GtkSalFrame()
 
     delete m_pIMHandler;
 
+    //tdf#108705 remove grabs on event widget before
+    //destroying event widget
+    while (m_nGrabLevel)
+        removeGrabLevel();
+
     GtkWidget *pEventWidget = getMouseEventWidget();
     for (auto handler_id : m_aMouseSignalIds)
         g_signal_handler_disconnect(G_OBJECT(pEventWidget), handler_id);


More information about the Libreoffice-commits mailing list