diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-05-21 10:11:51 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-05-21 10:11:51 +0200 |
| commit | fb8617e2f546078eab1ef132134d96bc768d63f7 (patch) | |
| tree | a8d2427b8a493f678f1bd36aa9a9b608f7187f48 /comphelper | |
| parent | 63c03e7f1bb7349cd4168ed30a0535f7c928207f (diff) | |
| parent | 51066323fd14918f65ea7ba66e14b9c7604eb978 (diff) | |
npower13_objectmodules: rebase and merge with DEV300_m78
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/namedvaluecollection.hxx | 7 | ||||
| -rw-r--r-- | comphelper/qa/makefile.mk | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/namedvaluecollection.cxx | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx index 81aed9171408..72cd0e7cdfbe 100644 --- a/comphelper/inc/comphelper/namedvaluecollection.hxx +++ b/comphelper/inc/comphelper/namedvaluecollection.hxx @@ -61,6 +61,8 @@ namespace comphelper NamedValueCollection( const NamedValueCollection& _rCopySource ); + NamedValueCollection& operator=( const NamedValueCollection& i_rCopySource ); + /** constructs a collection @param _rElements the wrapped elements of the collection. The <code>Any</code> might contain a sequence of @@ -104,6 +106,11 @@ namespace comphelper impl_assign( _rArguments ); } + inline void clear() + { + impl_assign( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); + } + /// returns the number of elements in the collection size_t size() const; diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk index 6e715675bb03..0360d308529e 100644 --- a/comphelper/qa/makefile.mk +++ b/comphelper/qa/makefile.mk @@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk +CFLAGSCXX += $(CPPUNIT_CFLAGS) + DLLPRE = # no leading "lib" on .so files INCPRE += $(MISC)$/$(TARGET)$/inc diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 570a85122c96..8bab7fa3d7c7 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -85,7 +85,14 @@ namespace comphelper NamedValueCollection::NamedValueCollection( const NamedValueCollection& _rCopySource ) :m_pImpl( new NamedValueCollection_Impl ) { - m_pImpl->aValues = _rCopySource.m_pImpl->aValues; + *this = _rCopySource; + } + + //-------------------------------------------------------------------- + NamedValueCollection& NamedValueCollection::operator=( const NamedValueCollection& i_rCopySource ) + { + m_pImpl->aValues = i_rCopySource.m_pImpl->aValues; + return *this; } //-------------------------------------------------------------------- |