INTEGRATION: CWS dba30b (1.9.8); FILE MERGED

2008/04/15 22:19:48 fs 1.9.8.2: RESYNC: (1.9-1.10); FILE MERGED
2008/03/16 14:00:38 fs 1.9.8.1: #i86996# added: copy ctor / 'merge'

1 files changed, 23 insertions, 1 deletions

diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index e07c0ce2d931..921e49a2750e 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: namedvaluecollection.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -84,6 +84,13 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
+    NamedValueCollection::NamedValueCollection( const NamedValueCollection& _rCopySource )
+        :m_pImpl( new NamedValueCollection_Impl )
+    {
+        m_pImpl->aValues = _rCopySource.m_pImpl->aValues;
+    }
+
+    //--------------------------------------------------------------------
     NamedValueCollection::NamedValueCollection( const Any& _rElements )
         :m_pImpl( new NamedValueCollection_Impl )
     {
@@ -131,6 +138,21 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
+    NamedValueCollection& NamedValueCollection::merge( const NamedValueCollection& _rAdditionalValues, bool _bOverwriteExisting )
+    {
+        for (   NamedValueRepository::const_iterator namedValue = _rAdditionalValues.m_pImpl->aValues.begin();
+                namedValue != _rAdditionalValues.m_pImpl->aValues.end();
+                ++namedValue
+            )
+        {
+            if ( _bOverwriteExisting || !impl_has( namedValue->first ) )
+                impl_put( namedValue->first, namedValue->second );
+        }
+
+        return *this;
+    }
+
+    //--------------------------------------------------------------------
     size_t NamedValueCollection::size() const
     {
         return m_pImpl->aValues.size();