diff options
| author | sb <sb@openoffice.org> | 2010-04-23 09:28:06 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-23 09:28:06 +0200 |
| commit | 86f5f0bdb3f3bf45d4a2095bdd81d66123b97f62 (patch) | |
| tree | 28cee930ef2e99f5af23cfaed87df1180f82f34a /configmgr | |
| parent | 3e6c047dea8318a3b271f59521843fdd72f25a2c (diff) | |
| parent | 3e41502e56c37991dd6e645fd1ff8fb7a325ff1b (diff) | |
sb122: merged in DEV300_m77 via cws/sb121
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/components.cxx | 10 | ||||
| -rw-r--r-- | configmgr/source/xcsparser.cxx | 24 |
2 files changed, 16 insertions, 18 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 6d97971e1a2c..48f90fa8382e 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -494,12 +494,10 @@ void Components::parseFileList( try { (*parseFile)(url, layer, data_, 0, 0); } catch (css::container::NoSuchElementException & e) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "stat'ed file does not exist: ")) + - e.Message), - css::uno::Reference< css::uno::XInterface >()); + OSL_TRACE( + "configmgr file does not exist: %s", + rtl::OUStringToOString( + e.Message, RTL_TEXTENCODING_UTF8).getStr()); } } if (i == -1) { diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 12e64ebbe171..8bda874cc5b3 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -78,19 +78,19 @@ void merge( case Node::KIND_LOCALIZED_VALUE: break; //TODO: merge certain parts? case Node::KIND_GROUP: - if (dynamic_cast< GroupNode * >(original.get())->isExtensible()) { - for (NodeMap::iterator i2(update->getMembers().begin()); - i2 != update->getMembers().end(); ++i2) - { - NodeMap::iterator i1( - original->getMembers().find(i2->first)); - if (i1 == original->getMembers().end()) { - if (i2->second->kind() == Node::KIND_PROPERTY) { - original->getMembers().insert(*i2); - } - } else if (i2->second->kind() == i1->second->kind()) { - merge(i1->second, i2->second); + for (NodeMap::iterator i2(update->getMembers().begin()); + i2 != update->getMembers().end(); ++i2) + { + NodeMap::iterator i1(original->getMembers().find(i2->first)); + if (i1 == original->getMembers().end()) { + if (i2->second->kind() == Node::KIND_PROPERTY && + dynamic_cast< GroupNode * >( + original.get())->isExtensible()) + { + original->getMembers().insert(*i2); } + } else if (i2->second->kind() == i1->second->kind()) { + merge(i1->second, i2->second); } } break; |