targetted misc. minor cppcheck cleanups reversion

Change-Id: Ic7f91c035d3e7f0e792d2e9ab217e1fc4ebcf697

7 files changed, 8 insertions, 8 deletions

diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 223a758eaed3..17ed51e0bf80 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -224,7 +224,7 @@ void SwAccessiblePortionData::LineBreak()
 void SwAccessiblePortionData::Skip(sal_uInt16 nLength)
 {
     OSL_ENSURE( !bFinished, "We are already done!" );
-    OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );
+    OSL_ENSURE( aModelPositions.size() == 0, "Never Skip() after portions" );
     OSL_ENSURE( nLength <= pTxtNode->GetTxt().Len(), "skip exceeds model string!" );
 
     nModelPosition += nLength;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f6e43fc744fb..dfd80d97e6db 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3298,7 +3298,7 @@ void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes,
         }
     }
 
-    if ( !aSmartTagTypes.empty() )
+    if ( aSmartTagTypes.size() )
     {
         rSmartTagTypes.realloc( aSmartTagTypes.size() );
         rStringKeyMaps.realloc( aSmartTagTypes.size() );
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 2df5fff4b165..7633a6ffa7d6 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -332,7 +332,7 @@ void SwSelPaintRects::Show()
 
         if(mpCursorOverlay)
         {
-            if(!aNewRanges.empty())
+            if(aNewRanges.size())
             {
                 static_cast< sdr::overlay::OverlaySelection* >(mpCursorOverlay)->setRanges(aNewRanges);
             }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 8d5c6d78e0e5..7caae4dd4ad7 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1052,7 +1052,7 @@ sal_Bool SwDoc::DelNumRule( const String& rName, sal_Bool bBroadcast )
 
                 ++aListIter;
             }
-            while ( !aListsForDeletion.empty() )
+            while ( aListsForDeletion.size() > 0 )
             {
                 SwList* pList = aListsForDeletion.back();
                 aListsForDeletion.pop_back();
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index c647089ccd31..4f6a30a95443 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -421,7 +421,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
                         pValues[nTokenIndex] = aPropVals;
                         nTokenIndex++;
 
-                        ++aIt; // #i24377#
+                        aIt++; // #i24377#
                     }
                     aSequPropVals.realloc(nTokenIndex);
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 619889fefe73..ffacb5d0ef7e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2515,7 +2515,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
                 aAuthFieldsLB.RemoveEntry(nLstBoxPos);
             }
 
-            ++aIt; // #i21237#
+            aIt++; // #i21237#
         }
         aAuthFieldsLB.SelectEntryPos(0);
     }
@@ -2926,7 +2926,7 @@ void    SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
                 bLastWasText = sal_False;
             }
 
-            ++aIt; // #i21237#
+            aIt++; // #i21237#
         }
         if(!bLastWasText)
         {
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 5be01f847ffe..ae65e1f4522b 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -853,7 +853,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept )
     ListBoxEntries_t::iterator aEnd = aRedlines.end();
     for( ListBoxEntries_t::iterator aIter = aRedlines.begin();
          aIter != aEnd;
-         ++aIter )
+         aIter++ )
     {
         sal_uInt16 nPosition = GetRedlinePos( **aIter );
         if( nPosition != USHRT_MAX )