diff options
| author | sb <sb@openoffice.org> | 2010-03-26 11:06:19 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-26 11:06:19 +0100 |
| commit | 7ff56983823047120541f724dfd2fb80b2a6432d (patch) | |
| tree | feb0ff2c881834155ec9c7c8185f2c5fa4472a17 /configmgr/source/xcsparser.cxx | |
| parent | 41b28993173f98f858a90fb7d8f259e24207ccbe (diff) | |
sb121: #i110203# added configmgr::update::insertModificationXcuFile and adapted old configuration data migration to it; some cleanup
Diffstat (limited to 'configmgr/source/xcsparser.cxx')
| -rw-r--r-- | configmgr/source/xcsparser.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 3fc719f00fe9..12e64ebbe171 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -119,7 +119,7 @@ void merge( } -XcsParser::XcsParser(int layer, Data * data): +XcsParser::XcsParser(int layer, Data & data): valueParser_(layer), data_(data), state_(STATE_START) {} @@ -279,9 +279,9 @@ void XcsParser::endElement(XmlReader const & reader) { switch (state_) { case STATE_TEMPLATES: { - NodeMap::iterator i(data_->templates.find(top.name)); - if (i == data_->templates.end()) { - data_->templates.insert( + NodeMap::iterator i(data_.templates.find(top.name)); + if (i == data_.templates.end()) { + data_.templates.insert( NodeMap::value_type(top.name, top.node)); } else { merge(i->second, top.node); @@ -290,9 +290,9 @@ void XcsParser::endElement(XmlReader const & reader) { break; case STATE_COMPONENT: { - NodeMap::iterator i(data_->components.find(top.name)); - if (i == data_->components.end()) { - data_->components.insert( + NodeMap::iterator i(data_.components.find(top.name)); + if (i == data_.components.end()) { + data_.components.insert( NodeMap::value_type(top.name, top.node)); } else { merge(i->second, top.node); @@ -443,7 +443,7 @@ void XcsParser::handleNodeRef(XmlReader & reader) { css::uno::Reference< css::uno::XInterface >()); } rtl::Reference< Node > tmpl( - data_->getTemplate( + data_.getTemplate( valueParser_.getLayer(), xmldata::parseTemplateReference( component, hasNodeType, nodeType, 0))); |