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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 32196af8ef5fd6473668ad147c6bfe8c2adf7e52
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 12:09:19 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 6 15:20:24 2021 +0200

    gtk4: convert GtkToggleToolButton to GtkToggleButton
    
    Change-Id: I35b5cbc0bc4fb50f0eb763b1de1d31646bbf961e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118478
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 011ffadbb5e4..d6b9ce814776 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -440,7 +440,8 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
 
             if (sName == "label")
             {
-                if (GetParentObjectType(xChild) == "GtkToolButton")
+                OUString sParentClass = GetParentObjectType(xChild);
+                if (sParentClass == "GtkToolButton" || sParentClass == "GtkToggleToolButton")
                     xName->setNodeValue("tooltip-text");
                 xPropertyLabel = xChild;
             }
@@ -1145,6 +1146,10 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             {
                 xClass->setNodeValue("GtkButton");
             }
+            else if (sClass == "GtkToggleToolButton")
+            {
+                xClass->setNodeValue("GtkToggleButton");
+            }
             else if (sClass == "GtkBox")
             {
                 // reverse the order of the pack-type=end widgets