vcl/unx/gtk3/gtkinst.cxx | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit cef8d2d1ea9ac8709b343b0e9d269ab1cbc44a7e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 27 10:05:07 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 27 14:51:55 2021 +0200
gtk4: strip accelerator tag
unclear yet if there's another way to do it
Change-Id: Ic3355d45bb3bb73c446b576b9cc65204cd39d180
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116238
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 7000e325b607..4759c0c631f3 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18779,6 +18779,11 @@ ConvertResult Convert3To4(const
Reference<css::xml::dom::XNode>& xNode)
// TODO <relation type="labelled-by" target="pagenumcb"/> ->
<relation name="labelled-by">pagenumcb</relation>
xRemoveList.push_back(xChild);
}
+ else if (xChild->getNodeName() == "accelerator")
+ {
+ // TODO is anything like this supported anymore in .ui files
+ xRemoveList.push_back(xChild);
+ }
auto xNextChild = xChild->getNextSibling();
@@ -19867,7 +19872,8 @@ void GtkInstanceWidget::help_hierarchy_foreach(const
std::function<bool(const OS
weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const
OUString& rUIRoot, const OUString& rUIFile)
{
#if GTK_CHECK_VERSION(4, 0, 0)
- if (rUIFile != "cui/ui/hyphenate.ui" &&
+ if (rUIFile != "cui/ui/aboutdialog.ui" &&
+ rUIFile != "cui/ui/hyphenate.ui" &&
rUIFile != "cui/ui/objectnamedialog.ui" &&
rUIFile != "cui/ui/objecttitledescdialog.ui" &&
rUIFile != "cui/ui/percentdialog.ui" &&
@@ -19882,6 +19888,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget*
pParent, const OUString&
rUIFile != "sfx/ui/querysavedialog.ui" &&
rUIFile != "sfx/ui/licensedialog.ui" &&
rUIFile != "sfx/ui/linefragment.ui" &&
+ rUIFile != "sfx/ui/loadtemplatedialog.ui" &&
rUIFile != "sfx/ui/securityinfopage.ui" &&
rUIFile != "svt/ui/javadisableddialog.ui" &&
rUIFile != "svx/ui/fontworkgallerydialog.ui" &&
@@ -19899,8 +19906,11 @@ weld::Builder*
GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
rUIFile != "modules/smath/ui/fontsizedialog.ui" &&
rUIFile != "modules/smath/ui/savedefaultsdialog.ui" &&
rUIFile != "modules/swriter/ui/gotopagedialog.ui" &&
+ rUIFile != "modules/swriter/ui/exchangedatabases.ui" &&
+ rUIFile != "modules/swriter/ui/insertbookmark.ui" &&
rUIFile != "modules/swriter/ui/insertfootnote.ui" &&
rUIFile != "modules/swriter/ui/inserttable.ui" &&
+ rUIFile != "modules/swriter/ui/renameobjectdialog.ui" &&
rUIFile != "modules/swriter/ui/statisticsinfopage.ui" &&
rUIFile != "modules/swriter/ui/wordcount.ui")
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
