configmgr/source/xcuparser.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4c690773521517da8d9512ef1390284b59afd593
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Aug 15 17:39:23 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Sep 23 12:17:36 2019 +0200
Related tdf#90429: Don't erroneously pop unrelated path segments
...when coming across a bad set node <prop> member. The ooo2gd_3.0.0.oxt
(see
referenced bug for links) Addons.xcu contains two such bogus props
> <node oor:name="AddonUI">
> <node oor:name="OfficeMenuBarMerging">
> <node oor:name="org.openoffice.gdocs.gdocs" oor:op="replace">
> <prop oor:name="ImageIdentifier" oor:type="xs:string">
> <value/>
> </prop>
> </node>
> </node>
> <node oor:name="OfficeToolBar">
> <node oor:name="org.openoffice.gdocs.gdocs" oor:op="replace">
> <prop oor:name="UIName" oor:type="xs:string">
> <value>Google Docs</value>
> </prop>
> </node>
> </node>
> </node>
so that a later
> <node oor:name="AddonUI">
> <node oor:name="Images">
was processed with path_ erroneously stripped down to the root path.
It appears that this has been broken ever since
7d9bce7ca0408786d0ad448dee0f2bf480870d3e "jl153: #i110720# ignore spurious
<prop> elements in .xcu set nodes".
Change-Id: I1d069b7226c8202b6eb93f59d294ce7f25681f80
Reviewed-on: https://gerrit.libreoffice.org/77537
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 5a522a0196aaa071bd3ac59b3088246e3fe98f34)
Reviewed-on: https://gerrit.libreoffice.org/79074
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 8a165cb1be02..8aa819515b09 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -161,7 +161,7 @@ bool XcuParser::startElement(
"configmgr",
"bad set node <prop> member in \"" << reader.getUrl()
<< '"');
- state_.push(State::Ignore(true));
+ state_.push(State::Ignore(false));
} else {
throw css::uno::RuntimeException(
"bad set node member <" + name.convertFromUtf8() +
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
