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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx     |    5 +++++
 vcl/unx/gtk4/convert3to4.cxx |    6 ++++++
 2 files changed, 11 insertions(+)

New commits:
commit 544e279f981afee23e3c02d62adb2c377ef6700f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 12:06:26 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 6 17:48:18 2021 +0200

    gtk4: add some more working dialogs
    
    Change-Id: I7fc4c6bfecca783a4c60c13f61c66a8a665e41a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118490
    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 a2debd43a004..4503a161cb52 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22506,6 +22506,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "sfx/ui/linefragment.ui" &&
         rUIFile != "sfx/ui/loadtemplatedialog.ui" &&
         rUIFile != "sfx/ui/managestylepage.ui" &&
+        rUIFile != "sfx/ui/panel.ui" &&
         rUIFile != "sfx/ui/password.ui" &&
         rUIFile != "sfx/ui/printeroptionsdialog.ui" &&
         rUIFile != "sfx/ui/safemodequerydialog.ui" &&
@@ -22668,6 +22669,10 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/swriter/ui/outlinenumbering.ui" &&
         rUIFile != "modules/swriter/ui/outlinenumberingpage.ui" &&
         rUIFile != "modules/swriter/ui/outlinepositionpage.ui" &&
+        rUIFile != "modules/swriter/ui/pagefooterpanel.ui" &&
+        rUIFile != "modules/swriter/ui/pageformatpanel.ui" &&
+        rUIFile != "modules/swriter/ui/pageheaderpanel.ui" &&
+        rUIFile != "modules/swriter/ui/pagestylespanel.ui" &&
         rUIFile != "modules/swriter/ui/paradialog.ui" &&
         rUIFile != "modules/swriter/ui/printeroptions.ui" &&
         rUIFile != "modules/swriter/ui/printoptionspage.ui" &&
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index d6b9ce814776..00620439f39b 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -452,6 +452,9 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             if (sName == "icon-name")
                 xPropertyIconName = xChild;
 
+            if (sName == "show-arrow")
+                xRemoveList.push_back(xChild);
+
             if (sName == "events")
                 xRemoveList.push_back(xChild);
 
@@ -516,6 +519,9 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
 
                     xRemoveList.push_back(xChild);
                 }
+
+                if (GetParentObjectType(xChild) == "GtkToolbar")
+                    xRemoveList.push_back(xChild);
             }
 
             if (sName == "truncate-multiline")