vcl/unx/gtk3/gtkinst.cxx | 1 +
vcl/unx/gtk4/convert3to4.cxx | 6 ++++++
2 files changed, 7 insertions(+)
New commits:
commit b6e4e3ac36e1b25afd0a2c71a549357b5928a47c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jun 3 21:11:43 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 4 09:18:09 2021 +0200
gtk4: strip use-popover from GtkMenuButton
Change-Id: Ib9d74ebb69246c2e505d576733b5c34959f9666f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116683
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 ef4249b32a7d..fd5470630762 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21966,6 +21966,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget*
pParent, const OUString&
rUIFile != "modules/smath/ui/alignmentdialog.ui" &&
rUIFile != "modules/smath/ui/catalogdialog.ui" &&
rUIFile != "modules/smath/ui/fontsizedialog.ui" &&
+ rUIFile != "modules/smath/ui/fonttypedialog.ui" &&
rUIFile != "modules/smath/ui/savedefaultsdialog.ui" &&
rUIFile != "modules/swriter/ui/bibliographyentry.ui" &&
rUIFile != "modules/swriter/ui/columndialog.ui" &&
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 4caef9bce9f8..1c0ba41f585b 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -348,6 +348,12 @@ ConvertResult Convert3To4(const
css::uno::Reference<css::xml::dom::XNode>& xNode
}
}
+ if (sName == "use-popover")
+ {
+ if (GetParentObjectType(xChild) == "GtkMenuButton")
+ xRemoveList.push_back(xChild);
+ }
+
if (sName == "hscrollbar-policy")
{
if (GetParentObjectType(xChild) == "GtkScrolledWindow")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
