122397: - XCU file parsing: correct node containment check in case the node is not contained in root

- simplify AOO 3.4.x/OOo 3.x migration configuration

1 files changed, 6 insertions, 4 deletions

diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index c43690299ca9..722603ff5380 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -119,15 +119,17 @@ Partial::Containment Partial::contains(Path const & path) const {
     bool includes = false;
     for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
         Node::Children::const_iterator j(p->children.find(*i));
-        if (j == p->children.end()) {
+        if ( j == p->children.end() )
+        {
             break;
         }
         p = &j->second;
         includes |= p->startInclude;
     }
-    return p->children.empty() && !p->startInclude
-        ? CONTAINS_NOT
-        : includes ? CONTAINS_NODE : CONTAINS_SUBNODES;
+    return ( ( p->children.empty() || p == &root_ )
+             && !p->startInclude )
+           ? CONTAINS_NOT
+           : ( includes ? CONTAINS_NODE : CONTAINS_SUBNODES );
 }
 
 }