[Libreoffice-commits] core.git: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 24 09:19:25 UTC 2019


 vcl/unx/gtk3/gtk3gtkframe.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 114ed1814c8cee31f90585578755c9fe20a0618a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 23 15:55:27 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 24 10:18:59 2019 +0100

    Related: tdf#122662 unused condition
    
    seen while investigating tdf#122662
    
    since...
    
    commit ff4b8d39e649ed56770b28550158b5148432ee48
    Date:   Wed Jul 1 20:58:14 2015 +0100
    
        gtk3: disable using notification that we are in the backdrop
    
    there's no need for this code
    
    Change-Id: Iea7f30f8b9a601b0254e6472d8d33a1664ec18c0
    Reviewed-on: https://gerrit.libreoffice.org/66804
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 091f4d2d3b3f..7f74dae76270 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3324,15 +3324,7 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointe
 gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame )
 {
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
-
-    //If we went into the backdrop we disabled the toplevel window, if we
-    //receive a delete here, re-enable so we can process it
-    bool bBackDrop = (gtk_widget_get_state_flags(GTK_WIDGET(pThis->m_pWindow)) & GTK_STATE_FLAG_BACKDROP);
-    if (bBackDrop)
-        pThis->GetWindow()->Enable();
-
     pThis->CallCallbackExc( SalEvent::Close, nullptr );
-
     return true;
 }
 


More information about the Libreoffice-commits mailing list