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: Stephan Bergmann <sbergman@redhat.com>
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index c5e8a9b..bc00b7b 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -127,7 +127,7 @@ bool XcdParser::startElement(
reader, nsId, name, existingDependencies);
}
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);
nesting_ = 1;
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index e2e5d77..d99ee49 100644
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
@@ -97,9 +97,7 @@
<!-- must syntactically match xs:integer and have a value in {0, ..., 8,
11, 12, 14, ..., 31, 65534, 65535} -->
<!-- oor:items is an alternative root element to oor:component-data (in plain
.xcu files only; not when nested in an .xcd file), used for the user-layer
registrymodifications.xcu: -->
<!-- oor:items is an alternative root element to oor:component-data: -->
<!ELEMENT oor:items (item*)>
<!ATTLIST oor:items>
