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

New commits:
commit f7e88346115111112981466f46a533e7aee5f6ff
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 2 14:13:58 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jun 2 16:48:06 2021 +0200

    gtk4: GtkExpander label-fill was removed
    
    Change-Id: I8f14df63d80b650583f9389355c0dcd455a5061d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116596
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3f3c6cc56dda..2e81c4d29b93 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20985,6 +20985,12 @@ ConvertResult Convert3To4(const 
Reference<css::xml::dom::XNode>& xNode)
                     xRemoveList.push_back(xChild);
             }
 
+            if (sName == "label-fill")
+            {
+                if (GetParentObjectType(xChild) == "GtkExpander")
+                    xRemoveList.push_back(xChild);
+            }
+
             // remove 'Help' button label and replace with a help icon instead
             if (sName == "label" && GetParentObjectType(xChild) == "GtkButton")
             {
@@ -22481,6 +22487,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* 
pParent, const OUString&
         rUIFile != "svt/ui/javadisableddialog.ui" &&
         rUIFile != "svx/ui/accessibilitycheckdialog.ui" &&
         rUIFile != "svx/ui/accessibilitycheckentry.ui" &&
+        rUIFile != "svx/ui/findreplacedialog.ui" &&
         rUIFile != "svx/ui/fontworkgallerydialog.ui" &&
         rUIFile != "modules/BasicIDE/ui/basicmacrodialog.ui" &&
         rUIFile != "modules/BasicIDE/ui/dialogpage.ui" &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to