diff options
| author | sb <sb@openoffice.org> | 2010-04-12 15:12:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-12 15:12:26 +0200 |
| commit | 6b2646c3d6811dde593ae1dac859e907bb4cab94 (patch) | |
| tree | db196c8a22ef668c1855d2bfb9358f3162666e9f /configmgr/source | |
| parent | 2447a97ad0a882ecd3b1bb006794664f94eb98fe (diff) | |
sb122: #i110083# improve xcsparser.cxx merge function
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/xcsparser.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 12e64ebbe1..8bda874cc5 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; |