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

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/colorrowdialog.ui |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx           |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 013861c44009a041b0f3fc628358e5eaf1db5895
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 10 15:02:58 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 10 17:14:19 2019 +0200

    avoid warning on teardown for non-dialogs/assistants
    
    Change-Id: Icba9df171fee73e16133794017ead1ad4a7fc470
    Reviewed-on: https://gerrit.libreoffice.org/80613
    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/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 67cf394bf345..1ddbc7f0b180 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4187,7 +4187,8 @@ public:
             m_aHiddenWidgets.clear();
         }
 
-        g_signal_handler_disconnect(m_pDialog, m_nCloseSignalId);
+        if (m_nCloseSignalId)
+            g_signal_handler_disconnect(m_pDialog, m_nCloseSignalId);
         if (m_nResponseSignalId)
             g_signal_handler_disconnect(m_pDialog, m_nResponseSignalId);
         if (m_nCancelSignalId)
commit 0563010afa673b93cf3a39ba30910053d2c6ec9e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 10 14:38:33 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 10 17:14:05 2019 +0200

    fix has-default without can-default
    
    Change-Id: I3b7993a2575b51f30bc5b2eb24e84d71728aa934
    Reviewed-on: https://gerrit.libreoffice.org/80611
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/uiconfig/scalc/ui/colorrowdialog.ui b/sc/uiconfig/scalc/ui/colorrowdialog.ui
index bfe948ff3304..1ffb54edfc23 100644
--- a/sc/uiconfig/scalc/ui/colorrowdialog.ui
+++ b/sc/uiconfig/scalc/ui/colorrowdialog.ui
@@ -28,6 +28,7 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>