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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 23 16:23:16 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 179909a9ec0ac3c73cc3f797da63ae20c9057636
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 21 19:17:36 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 23 18:22:41 2020 +0200

    g_object_set_data to unset is unnecessary and unhelpful
    
    Change-Id: I44665542f70c39c7861940d2191860ca9f53a700
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101179
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 671938d721c9..c73966efcd5c 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -15842,13 +15842,7 @@ public:
     {
         g_slist_free(m_pObjectList);
         g_object_unref(m_pBuilder);
-
-        if (m_xInterimGlue)
-        {
-            assert(m_pParentWidget);
-            g_object_set_data(G_OBJECT(m_pParentWidget), "InterimWindowGlue", nullptr);
-            m_xInterimGlue.disposeAndClear();
-        }
+        m_xInterimGlue.disposeAndClear();
     }
 
     //ideally we would have/use weld::Container add and explicitly


More information about the Libreoffice-commits mailing list