vcl/unx/gtk3/gtkinst.cxx | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 921f770d8980dc0dbc70efee0db872e329f99565
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat May 15 20:52:44 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon May 17 09:43:46 2021 +0200
gtk4: put cancel at start of GtkHeaderBar
Change-Id: I606a7467529fbe9921702476d2aa4277a0b19580
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115666
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 68d539eaf6b0..82a506ebc74b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17883,6 +17883,21 @@ bool ConvertTree(const
Reference<css::xml::dom::XNode>& xNode)
// turn parent tag of <child> into
<child type="end">
css::uno::Reference<css::xml::dom::XAttr> xTypeEnd =
xDoc->createAttribute("type");
xTypeEnd->setValue("end");
+
+ for
(css::uno::Reference<css::xml::dom::XNode> xObjectCandidate =
xTitleChild->getFirstChild();
+ xObjectCandidate.is();
+ xObjectCandidate =
xObjectCandidate->getNextSibling())
+ {
+ if
(xObjectCandidate->getNodeName() == "object")
+ {
+
css::uno::Reference<css::xml::dom::XNamedNodeMap> xObjectMap =
xObjectCandidate->getAttributes();
+
css::uno::Reference<css::xml::dom::XNode> xObjectId =
xObjectMap->getNamedItem("id");
+ if (xObjectId->getNodeValue()
== "cancel")
+
xTypeEnd->setValue("start");
+ break;
+ }
+ }
+
xChildElem->setAttributeNode(xTypeEnd);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
