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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 159666084a28ab3591b96cdd390f8fa0ac62bf3c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 1 12:36:50 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 1 15:27:39 2021 +0200

    gtk4: GtkButtonBox homogeneous isn't the same as GtkBox homogeneous
    
    Change-Id: I9dec7259b2dcbe4d7ea0143eaa33509e2a39d912
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116534
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 02f727c80014..71c340b0c0de 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20993,6 +20993,13 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode)
                     xRemoveList.push_back(xChild);
             }
 
+            if (sName == "homogeneous")
+            {
+                // e.g. the buttonbox in xml filter dialog
+                if (GetParentObjectType(xChild) == "GtkButtonBox")
+                    xRemoveList.push_back(xChild);
+            }
+
             if (sName == "shadow-type")
             {
                 if (GetParentObjectType(xChild) == "GtkFrame")