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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk4/convert3to4.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 91d971c6dc0ba4753ba3e1939b0b65b09469f739
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 16:46:36 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 7 09:26:59 2021 +0200

    gtk4: convert GtkMenuToolButton to GtkMenuButton
    
    Change-Id: I5b11e49e5eab68926b76814a07718e761fc6beda
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118521
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 00620439f39b..5c8cc1dec71e 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -441,8 +441,11 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             if (sName == "label")
             {
                 OUString sParentClass = GetParentObjectType(xChild);
-                if (sParentClass == "GtkToolButton" || sParentClass == "GtkToggleToolButton")
+                if (sParentClass == "GtkToolButton" || sParentClass == "GtkMenuToolButton"
+                    || sParentClass == "GtkToggleToolButton")
+                {
                     xName->setNodeValue("tooltip-text");
+                }
                 xPropertyLabel = xChild;
             }
 
@@ -1152,6 +1155,10 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             {
                 xClass->setNodeValue("GtkButton");
             }
+            else if (sClass == "GtkMenuToolButton")
+            {
+                xClass->setNodeValue("GtkMenuButton");
+            }
             else if (sClass == "GtkToggleToolButton")
             {
                 xClass->setNodeValue("GtkToggleButton");