Kaydet (Commit) d644a561 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Allow <oor:items> in .xcd too

Can't remember a good reason not to.

Change-Id: Ie2c62783465b917696d19e66159b5862512c7a54
Reviewed-on: https://gerrit.libreoffice.org/70655
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 725a1f51
...@@ -127,7 +127,7 @@ bool XcdParser::startElement( ...@@ -127,7 +127,7 @@ bool XcdParser::startElement(
reader, nsId, name, existingDependencies); reader, nsId, name, existingDependencies);
} }
if (nsId == ParseManager::NAMESPACE_OOR && if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals("component-data")) (name.equals("component-data") || name.equals("items")))
{ {
nestedParser_ = new XcuParser(layer_ + 1, data_, nullptr, nullptr, nullptr); nestedParser_ = new XcuParser(layer_ + 1, data_, nullptr, nullptr, nullptr);
nesting_ = 1; nesting_ = 1;
......
...@@ -97,9 +97,7 @@ ...@@ -97,9 +97,7 @@
<!-- must syntactically match xs:integer and have a value in {0, ..., 8, <!-- must syntactically match xs:integer and have a value in {0, ..., 8,
11, 12, 14, ..., 31, 65534, 65535} --> 11, 12, 14, ..., 31, 65534, 65535} -->
<!-- oor:items is an alternative root element to oor:component-data (in plain <!-- oor:items is an alternative root element to oor:component-data: -->
.xcu files only; not when nested in an .xcd file), used for the user-layer
registrymodifications.xcu: -->
<!ELEMENT oor:items (item*)> <!ELEMENT oor:items (item*)>
<!ATTLIST oor:items> <!ATTLIST oor:items>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment