diff options
Diffstat (limited to 'writerfilter/source/dmapper/PropertyMap.cxx')
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 22f680b18e8f..4ea094b6c19a 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -224,12 +224,20 @@ template<class T> }; -void PropertyMap::insert( const PropertyMapPtr pMap, bool bOverwrite ) +void PropertyMap::InsertProps(const PropertyMapPtr pMap) +{ + if( pMap.get() ) + { + ::std::for_each( pMap->begin(), pMap->end(), + removeExistingElements<PropertyMap::value_type>(*this) ); + InsertPropsNoOverwrite(pMap); + } +} + +void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap) { if( pMap.get() ) { - if( bOverwrite ) - ::std::for_each( pMap->begin(), pMap->end(), removeExistingElements<PropertyMap::value_type>(*this) ); _PropertyMap::insert(pMap->begin(), pMap->end()); insertTableProperties(pMap.get()); |