Unified configmgr::Node::getMember{s,Map} again.

(With the insight that Data::components is RootNode::members.)

1 files changed, 6 insertions, 1 deletions

diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index fcc42e97cecc..df7ce604b649 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -208,7 +208,7 @@ rtl::Reference< Node > Data::findNode(
         ? rtl::Reference< Node >() : i->second;
 }
 
-Data::Data(): root_(new RootNode(components)) {}
+Data::Data(): root_(new RootNode) {}
 
 rtl::Reference< Node > Data::resolvePathRepresentation(
     rtl::OUString const & pathRepresentation,
@@ -244,6 +244,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
              pathRepresentation),
             css::uno::Reference< css::uno::XInterface >());
     }
+    NodeMap const & components = getComponents();
     NodeMap::const_iterator i(components.find(seg));
     rtl::OUStringBuffer canonic;
     rtl::Reference< Node > parent;
@@ -340,6 +341,10 @@ rtl::Reference< Node > Data::getTemplate(
     return findNode(layer, templates, fullName);
 }
 
+NodeMap & Data::getComponents() const {
+    return root_->getMembers();
+}
+
 Additions * Data::addExtensionXcuAdditions(
     rtl::OUString const & url, int layer)
 {