[Libreoffice-commits] core.git: 3 commits - comphelper/source solenv/gbuild

[Michael Stahl]

 comphelper/source/property/propertysetinfo.cxx |   20 +++++---------------
 solenv/gbuild/CppunitTest.mk                   |    3 +--
 2 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit dd205b85cc386f1ce7aa2e5b44c99ef4ae03aa18
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 18 22:19:46 2015 +0200

    Revert "gbuild: CppunitTest: allow specifying arguments with CPPUNITTEST_ARGS"
    
    This reverts commit 1b6be726449fb9b1ff54bc99a1b8839621444ddc.
    
    It turned out not to be necessary, see commit
    9ce371fa1626bb845e702ceef66a730547b313a8

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a4e9fa9..021ecc8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -74,8 +74,7 @@ $(if $(URE),\
 $(if $(VCL),\
 	--protector $(call gb_Library_get_target,vclbootstrapprotector) vclbootstrapprotector \
  ) \
-$(ARGS) \
-$(CPPUNITTEST_ARGS)
+$(ARGS)
 endef
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
commit 708f0d2afd8f988fbf5106543465815dd18b81ec
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 18 21:17:59 2015 +0200

    comphelper::PropertySetInfo: convert legacy assertion
    
    Change-Id: I23dbe1b3cf6cc611efe8a39c49f4e5b47bf25a49

diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index e9f5e37..bfd8e58 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -20,7 +20,6 @@
 
 #include <comphelper/propertysetinfo.hxx>
 
-#include <osl/diagnose.h>
 
 using namespace ::comphelper;
 using namespace ::com::sun::star;
@@ -64,13 +63,8 @@ void PropertyMapImpl::add(PropertyMapEntry const * pMap) throw()
 {
     while (!pMap->maName.isEmpty())
     {
-#ifdef DBG_UTIL
-        PropertyMap::iterator aIter = maPropertyMap.find( pMap->maName );
-        if( aIter != maPropertyMap.end() )
-        {
-            OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!");
-        }
-#endif
+        // check for duplicates
+        assert(maPropertyMap.find(pMap->maName) == maPropertyMap.end());
 
         maPropertyMap[pMap->maName] = pMap;
 
commit 24dbd76b8d03fa9800e42645bbf189ecb4ce39f4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 18 21:15:14 2015 +0200

    comphelper::PropertySetInfo remove unused parameter
    
    Change-Id: I960b31befe749860e926e5bb567c0b8d0f87867a

diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 3b10733..e9f5e37 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -36,7 +36,7 @@ public:
     PropertyMapImpl() throw();
     virtual ~PropertyMapImpl() throw();
 
-    void add( PropertyMapEntry const * pMap, sal_Int32 nCount = -1 ) throw();
+    void add(PropertyMapEntry const * pMap) throw();
     void remove( const OUString& aName ) throw();
 
     Sequence< Property > getProperties() throw();
@@ -60,13 +60,9 @@ PropertyMapImpl::~PropertyMapImpl() throw()
 {
 }
 
-void PropertyMapImpl::add( PropertyMapEntry const * pMap, sal_Int32 nCount ) throw()
+void PropertyMapImpl::add(PropertyMapEntry const * pMap) throw()
 {
-    // nCount < 0   => add all
-    // nCount == 0  => add nothing
-    // nCount > 0   => add at most nCount entries
-
-    while( !pMap->maName.isEmpty() && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
+    while (!pMap->maName.isEmpty())
     {
 #ifdef DBG_UTIL
         PropertyMap::iterator aIter = maPropertyMap.find( pMap->maName );