diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-28 14:00:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-28 16:47:47 +0200 |
| commit | 7a9a1ca7a0a82407b869b76d96d820864d98dcad (patch) | |
| tree | e3dcd22a68d0788f15096daf25c9e9fee81df90f /vcl | |
| parent | b7ed08d590507d8a3107fcdb692ca951c7c66466 (diff) | |
gtk4: remove 'homogeneous' on conversion to GtkHeaderBar
Change-Id: I5dcf6a186ecf22b0a0d7ba624c2adf737d0a7852
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116339
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 21a8c1c56222..5c5fbde02249 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -20952,9 +20952,10 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode) xContentAreaCandidate->getParentNode()->insertBefore(xActionArea, xContentAreaCandidate); - for (css::uno::Reference<css::xml::dom::XNode> xTitleChild = xChild->getFirstChild(); - xTitleChild.is(); xTitleChild = xTitleChild->getNextSibling()) + css::uno::Reference<css::xml::dom::XNode> xTitleChild = xChild->getFirstChild(); + while(xTitleChild.is()) { + auto xNextTitleChild = xTitleChild->getNextSibling(); if (xTitleChild->getNodeName() == "child") { css::uno::Reference<css::xml::dom::XElement> xChildElem(xTitleChild, css::uno::UNO_QUERY_THROW); @@ -20981,6 +20982,16 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode) xChildElem->setAttributeNode(xTypeEnd); } } + else if (xTitleChild->getNodeName() == "property") + { + // remove any <property name="homogeneous"> tag + css::uno::Reference<css::xml::dom::XNamedNodeMap> xTitleChildMap = xTitleChild->getAttributes(); + css::uno::Reference<css::xml::dom::XNode> xPropName = xTitleChildMap->getNamedItem("name"); + OUString sPropName(xPropName->getNodeValue().replace('_', '-')); + if (sPropName == "homogeneous") + xChild->removeChild(xTitleChild); + } + xTitleChild = xNextTitleChild; } break; @@ -22011,6 +22022,8 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "sfx/ui/securityinfopage.ui" && rUIFile != "svt/ui/javadisableddialog.ui" && rUIFile != "svx/ui/fontworkgallerydialog.ui" && + rUIFile != "modules/scalc/ui/dataform.ui" && + rUIFile != "modules/scalc/ui/dataformfragment.ui" && rUIFile != "modules/scalc/ui/definedatabaserangedialog.ui" && rUIFile != "modules/scalc/ui/deletecells.ui" && rUIFile != "modules/scalc/ui/deletecontents.ui" && |