configmgr/source/xcuparser.cxx | 2 +- external/liborcus/UnpackedTarball_liborcus.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 5a522a0196aaa071bd3ac59b3088246e3fe98f34 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Aug 15 17:39:23 2019 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Aug 16 08:17:07 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 <[email protected]> diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index 12eb1c2ea1a4..596d85b696da 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -157,7 +157,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() + commit 54f9abb9d3efb7363cfa95b6cf50a8ed3c38efcb Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Aug 15 17:09:06 2019 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Aug 16 08:16:59 2019 +0200 Record external/liborcus/create-element.patch.0 as covered upstream Change-Id: Ib1b1baf75cbd2d011e96a3d5b8876a6b356b0b7e Reviewed-on: https://gerrit.libreoffice.org/77536 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index eb1d5af676ce..834b8128d39f 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -15,6 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) +# * external/liborcus/create-element.patch.0 covered by upstream +# <https://gitlab.com/orcus/orcus/commit/1e024e37c59574965e1b07bc5097c014d4625227> "Fix linking of +# newly created element": $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/gcc9.patch.0 \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
