[Libreoffice-commits] .: 2 commits - comphelper/inc comphelper/source svtools/source

[Caolán McNamara]

 comphelper/inc/comphelper/sequence.hxx               |    8 ++------
 comphelper/source/property/MasterPropertySet.cxx     |    2 +-
 comphelper/source/property/MasterPropertySetInfo.cxx |    2 +-
 svtools/source/control/ctrlbox.cxx                   |    2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 4ee44eafacb666a14a2dac853e49a9729cd66a12
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 19 10:35:24 2011 +0100

    WaE: simplify this

diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 10ec860..9b9a4ac 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -179,13 +179,9 @@ namespace comphelper
         ,m_pCurrent(NULL)
     {
         ::com::sun::star::uno::Sequence< TYPE > aContainer;
-    #ifdef DBG_UTIL
-        sal_Bool bSuccess =
-    #endif
-        _rSequenceAny >>= aContainer;
-    #ifdef DBG_UTIL
+        sal_Bool bSuccess = _rSequenceAny >>= aContainer;
         OSL_ENSURE(bSuccess, "OSequenceIterator::OSequenceIterator: invalid Any!");
-    #endif
+        (void)bSuccess;
         construct(aContainer);
     }
 
commit 47af8cc933e99a494d251aaa0d1de8cc15b6bb61
Author: Kayo Hamid <kayo.hamid at gekkolinux.com.br>
Date:   Tue Apr 19 10:29:42 2011 +0100

    prefer prefix ++/-- operators

diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 2844031..78f33af 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -108,7 +108,7 @@ MasterPropertySet::~MasterPropertySet()
     while (aIter != aEnd )
     {
         delete (*aIter).second;
-        aIter++;
+        ++aIter;
     }
 }
 
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 583b38e..04b73c8 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -63,7 +63,7 @@ MasterPropertySetInfo::~MasterPropertySetInfo()
     while (aIter != aEnd )
     {
         delete (*aIter).second;
-        aIter++;
+        ++aIter;
     }
 }
 
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 2897af6..62057ce 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -394,7 +394,7 @@ long BorderWidthImpl::GuessWidth( long nLine1, long nLine2, long nGap )
         while ( pIt != aToCompare.end() && !bInvalid )
         {
             bInvalid = ( nWidth != *pIt );
-            pIt++;
+            ++pIt;
         }
         if ( bInvalid )
             nWidth = 0.0;