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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 15988fe00c4f49ae32ab2d5cf3c16495ab6e1d59
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 25 10:46:59 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 25 15:20:32 2020 +0200

    Related: tdf#135965 don't install accel group on adapter
    
    it already has a suitable one in this case
    
    Change-Id: I177e7c690ea91c82ac9a4e5fe21e40f2e2992992
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101314
    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 480aa2ee70a6..19cffc2640c3 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3923,11 +3923,15 @@ public:
         , m_pWindow(pWindow)
         , m_nToplevelFocusChangedSignalId(0)
     {
-        //hook up F1 to show help
-        GtkAccelGroup *pGroup = gtk_accel_group_new();
-        GClosure* closure = g_cclosure_new(G_CALLBACK(help_pressed), this, nullptr);
-        gtk_accel_group_connect(pGroup, GDK_KEY_F1, static_cast<GdkModifierType>(0), GTK_ACCEL_LOCKED, closure);
-        gtk_window_add_accel_group(pWindow, pGroup);
+        const bool bIsFrameWeld = pBuilder == nullptr;
+        if (!bIsFrameWeld)
+        {
+            //hook up F1 to show help
+            GtkAccelGroup *pGroup = gtk_accel_group_new();
+            GClosure* closure = g_cclosure_new(G_CALLBACK(help_pressed), this, nullptr);
+            gtk_accel_group_connect(pGroup, GDK_KEY_F1, static_cast<GdkModifierType>(0), GTK_ACCEL_LOCKED, closure);
+            gtk_window_add_accel_group(pWindow, pGroup);
+        }
     }
 
     virtual void set_title(const OUString& rTitle) override