[Libreoffice-commits] core.git: configmgr/source officecfg/registry

[Stephan Bergmann (via logerrit)]

 configmgr/source/xcdparser.cxx          |    2 +-
 officecfg/registry/component-update.dtd |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d644a561eeb3e6ceb943819895a40c461effdbe6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Apr 12 13:06:59 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Apr 12 16:03:49 2019 +0200

    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 at redhat.com>

diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index c5e8a9b017db..bc00b7b0b01d 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 e2e5d77dee11..d99ee499249e 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>