summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-04-29 14:17:32 +0200
committerThomas Lange [tl] <tl@openoffice.org>2010-04-29 14:17:32 +0200
commit3a944d0e285a0d2b514fd889facb73ec0802fc39 (patch)
treef604dbfbb934046ae4e337824b990f0ff2b7f5f6 /comphelper
parentaf5c3ad88ab4f93e825d9b6931727d36d87df05e (diff)
parentc5934ada09feec288519cbdfbe1c0c988a2fceec (diff)
cws tl78: merge with DEV300 m77
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/inc/comphelper/namedvaluecollection.hxx7
-rw-r--r--comphelper/qa/makefile.mk2
-rw-r--r--comphelper/source/misc/namedvaluecollection.cxx9
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;
}
//--------------------------------------------------------------------