Fix Prefer prefix ++/-- operators for non-primitive types

Change-Id: I4ebb1027151c3bc34f81fb1e13de6c4c5cfed54d

17 files changed, 42 insertions, 42 deletions

diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 80257bed3e7b..b9ce099d3691 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -185,7 +185,7 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPref
 
         // look for existing groups
         for ( ScDPSaveGroupItemVec::const_iterator aIter(aGroups.begin());
-                                    aIter != aGroups.end() && !bExists; aIter++ )
+                                    aIter != aGroups.end() && !bExists; ++aIter )
             if (aIter->GetGroupName().equals(aGroupName))         //! ignore case
                 bExists = true;
 
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index a0bb5d9c5ad3..9b5bf9b5763c 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -298,7 +298,7 @@ void ScDPGroupItem::AddElement( const ScDPItemData& rName )
 
 bool ScDPGroupItem::HasElement( const ScDPItemData& rData ) const
 {
-    for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != aElements.end(); aIter++ )
+    for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter )
         if ( aIter->IsCaseInsEqual( rData ) )
             return true;
 
@@ -307,7 +307,7 @@ bool ScDPGroupItem::HasElement( const ScDPItemData& rData ) const
 
 bool ScDPGroupItem::HasCommonElement( const ScDPGroupItem& rOther ) const
 {
-    for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != aElements.end(); aIter++ )
+    for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter )
         if ( rOther.HasElement( *aIter ) )
             return true;
 
@@ -388,7 +388,7 @@ const ScDPGroupItem* ScDPGroupDimension::GetGroupForData( const ScDPItemData& rD
 
 const ScDPGroupItem* ScDPGroupDimension::GetGroupForName( const ScDPItemData& rName ) const
 {
-    for ( ScDPGroupItemVec::const_iterator aIter(aItems.begin()); aIter != aItems.end(); aIter++ )
+    for ( ScDPGroupItemVec::const_iterator aIter(aItems.begin()); aIter != aItems.end(); ++aIter )
         if ( aIter->GetName().IsCaseInsEqual( rName ) )
             return &*aIter;
 
@@ -609,7 +609,7 @@ sal_uLong ScDPGroupTableData::GetNumberFormat(long nDim)
 
 void ScDPGroupTableData::DisposeData()
 {
-    for ( ScDPGroupDimensionVec::iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
         aIter->DisposeData();
 
     for ( long i=0; i<nSourceCount; i++ )
@@ -862,7 +862,7 @@ void ScDPGroupTableData::FillGroupValues(vector<SCROW>& rItems, const vector<lon
 
 sal_Bool ScDPGroupTableData::IsBaseForGroup(long nDim) const
 {
-    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
     {
         const ScDPGroupDimension& rDim = *aIter;
         if ( rDim.GetSourceDim() == nDim )
@@ -874,7 +874,7 @@ sal_Bool ScDPGroupTableData::IsBaseForGroup(long nDim) const
 
 long ScDPGroupTableData::GetGroupBase(long nGroupDim) const
 {
-    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
     {
         const ScDPGroupDimension& rDim = *aIter;
         if ( rDim.GetGroupDim() == nGroupDim )
@@ -894,7 +894,7 @@ sal_Bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
                pNumGroups[nDimension].IsDateDimension();
     }
 
-    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
     {
         const ScDPGroupDimension& rDim = *aIter;
         if ( rDim.GetGroupDim() == nDimension )
@@ -907,7 +907,7 @@ sal_Bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
 sal_Bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                     const ScDPItemData& rBaseData, long nBaseIndex ) const
 {
-    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
     {
         const ScDPGroupDimension& rDim = *aIter;
         if ( rDim.GetGroupDim() == nGroupIndex && rDim.GetSourceDim() == nBaseIndex )
@@ -937,7 +937,7 @@ sal_Bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, l
 {
     const ScDPGroupDimension* pFirstDim = NULL;
     const ScDPGroupDimension* pSecondDim = NULL;
-    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
+    for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
     {
         const ScDPGroupDimension* pDim = &(*aIter);
         if ( pDim->GetGroupDim() == nFirstIndex )
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index ab20da49e456..16756a55b13f 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2284,7 +2284,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::sta
     CustomAnimationEffectPtr pEffect;
 
     EffectSequence::const_iterator aIter( maEffects.begin() );
-    for( ; aIter != maEffects.end(); aIter++ )
+    for( ; aIter != maEffects.end(); ++aIter )
     {
         if( (*aIter)->getNode() == xNode )
         {
@@ -2303,7 +2303,7 @@ sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffect
     sal_Int32 nOffset = 0;
 
     EffectSequence::const_iterator aIter( maEffects.begin() );
-    for( ; aIter != maEffects.end(); aIter++, nOffset++ )
+    for( ; aIter != maEffects.end(); ++aIter, nOffset++ )
     {
         if( (*aIter) == xEffect )
             return nOffset;
@@ -2318,7 +2318,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO
 {
     EffectSequence::const_iterator aIter( maEffects.begin() );
     while( nOffset-- && aIter != maEffects.end() )
-        aIter++;
+        ++aIter;
 
     CustomAnimationEffectPtr pEffect;
     if( aIter != maEffects.end() )
@@ -2344,7 +2344,7 @@ bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape )
         }
         else
         {
-            aIter++;
+            ++aIter;
         }
     }
 
@@ -2360,7 +2360,7 @@ bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com:
     {
         if( (*aIter)->getTargetShape() == xShape )
             return true;
-        aIter++;
+        ++aIter;
     }
 
     return false;
@@ -2381,7 +2381,7 @@ void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTar
     {
         if( (*aIter)->getTargetShape() == aParaTarget.Shape )
             bChanges |= (*aIter)->checkForText();
-        aIter++;
+        ++aIter;
     }
 
     if( bChanges )
@@ -2435,7 +2435,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa
         if( bErased )
             bErased = false;
         else
-            aIter++;
+            ++aIter;
     }
 
     if( bChanges )
@@ -2587,7 +2587,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati
         }
         else
         {
-            aIter++;
+            ++aIter;
         }
     }
 
@@ -3623,7 +3623,7 @@ void MainSequence::implRebuild()
         else
         {
             pIS->implRebuild();
-            aIter++;
+            ++aIter;
         }
     }
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 50343d23ef13..bf8fd5027a2a 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -386,7 +386,7 @@ void CustomAnimationPresets::importEffects()
                         maEffectDiscriptorMap[aPresetId] = pDescriptor;
                     }
 
-                    aIter++;
+                    ++aIter;
                 }
             }
         }
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index 60d43bc5d101..c0684b3026f5 100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -115,7 +115,7 @@ SdrObject* ShapeList::getNextShape(SdrObject* pObj) const
         ListImpl::const_iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), pObj ) );
         if( aIter != maShapeList.end() )
         {
-            aIter++;
+            ++aIter;
             if( aIter != maShapeList.end() )
             {
                 return (*aIter);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c1d1701b4d6b..7801da526471 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1205,7 +1205,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl
     if( msTableFamilyName == aName )
         return Any( mxTableFamily );
 
-    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); iter++ )
+    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); ++iter )
     {
         if( (*iter).second->getName() == aName )
             return Any( Reference< XNameAccess >( static_cast< XNameAccess* >( (*iter).second.get() ) ) );
@@ -1227,7 +1227,7 @@ Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeE
     *pNames++ = mxCellFamily->getName();
     *pNames++ = msTableFamilyName;
 
-    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); iter++ )
+    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); ++iter )
     {
         *pNames++ = (*iter).second->getName();
     }
@@ -1250,7 +1250,7 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run
     if( msTableFamilyName == aName )
         return sal_True;
 
-    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); iter++ )
+    for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); ++iter )
     {
         if( (*iter).second->getName() == aName )
             return sal_True;
@@ -1310,7 +1310,7 @@ Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
                 throw IndexOutOfBoundsException();
             SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() );
             while( Index-- )
-                iter++;
+                ++iter;
 
             return Any( Reference< XNameAccess >( static_cast< XNameAccess* >( (*iter).second.get() ) ) );
         }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index bdf039d7eb08..84feaa4b56bb 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -892,7 +892,7 @@ void CustomAnimationPane::updateControls()
         {
             do
             {
-                aIter++;
+                ++aIter;
             }
             while( (aIter != mpMainSequence->getEnd()) && !(mpCustomAnimationList->isExpanded((*aIter)) ) );
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 426722523181..9f9e7068f10f 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -99,7 +99,7 @@ bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( c
         if( xListener.is() )
         {
             xListener->modified( _rEvent );
-            aIter++;
+            ++aIter;
         }
         else
         {
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 071ed49b75c2..be3f22925a8f 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -806,7 +806,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell)
         if (mbKeepMainViewShellOnTop && ! aDescriptor.IsMainViewShell())
         {
             if (maActiveViewShells.back().IsMainViewShell())
-                aInsertPosition++;
+                ++aInsertPosition;
         }
 
         maActiveViewShells.insert(aInsertPosition, aDescriptor);
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index bcc2f2adbee4..61942aba5ac5 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1521,7 +1521,7 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void)
 {
     for (ShellCache::iterator aI(maShellCache.begin());
          aI!=maShellCache.end();
-         aI++)
+         ++aI)
     {
         delete aI->second;
     }
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 7095058beb16..236775b15647 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -64,7 +64,7 @@ namespace sdr
 
                 if(pProcessor)
                 {
-                    for(OverlayObjectVector::const_iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); aIter++)
+                    for(OverlayObjectVector::const_iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
                     {
                         OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                         const OverlayObject& rCandidate = **aIter;
@@ -106,7 +106,7 @@ namespace sdr
 
             if(nSize)
             {
-                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); aIter++)
+                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
                 {
                     OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                     OverlayObject& rCandidate = **aIter;
@@ -162,7 +162,7 @@ namespace sdr
 
                 if(nSize)
                 {
-                    for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); aIter++)
+                    for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
                     {
                         OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                         OverlayObject& rCandidate = **aIter;
@@ -258,7 +258,7 @@ namespace sdr
 
             if(nSize)
             {
-                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); aIter++)
+                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
                 {
                     OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                     OverlayObject& rCandidate = **aIter;
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 87151071a154..43bb2cbc1e71 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -52,7 +52,7 @@ namespace sdr
         {
             OverlayObjectVector::iterator aStart(maVector.begin());
 
-            for(; aStart != maVector.end(); aStart++)
+            for(; aStart != maVector.end(); ++aStart)
             {
                 ::sdr::overlay::OverlayObject* pCandidate = *aStart;
 
@@ -92,7 +92,7 @@ namespace sdr
                         fLogicTolerance,
                         false);
 
-                    for(; aStart != maVector.end(); aStart++)
+                    for(; aStart != maVector.end(); ++aStart)
                     {
                         sdr::overlay::OverlayObject* pCandidate = *aStart;
                         OSL_ENSURE(pCandidate, "Corrupt OverlayObjectList (!)");
@@ -154,7 +154,7 @@ namespace sdr
             {
                 OverlayObjectVector::const_iterator aStart(maVector.begin());
 
-                for(; aStart != maVector.end(); aStart++)
+                for(; aStart != maVector.end(); ++aStart)
                 {
                     ::sdr::overlay::OverlayObject* pCandidate = *aStart;
                     aRetval.expand(pCandidate->getBaseRange());
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 79c563c12664..7ff112bd191b 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -221,7 +221,7 @@ sal_Bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc)
         if(*aIt == &rDoc)
         {
             aSourceDocs.erase(aIt);
-            return !aSourceDocs.size();
+            return aSourceDocs.empty();
         }
     }
     return sal_False;
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index e3f3a8194877..195ee5e481e9 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -172,7 +172,7 @@ struct VbaApplicationBase_Impl
         // remove the remaining timers
         for ( VbaTimerHashMap::iterator aIter = m_aTimerHash.begin();
               aIter != m_aTimerHash.end();
-              aIter++ )
+              ++aIter )
         {
             delete aIter->second;
             aIter->second = NULL;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 6632b47a49fe..ee0ad507c4db 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1765,7 +1765,7 @@ void SchXMLExportHelper_Impl::exportTable()
         sal_Int32 nC = 0;
         for( tStringVector::const_iterator aIt( aData.aColumnDescriptions.begin())
              ; (aIt != aData.aColumnDescriptions.end())
-             ; aIt++, nC++ )
+             ; ++aIt, nC++ )
         {
             bool bExportString = true;
             if( nC < nComplexCount )
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 770590bae2e9..e564264208b0 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -269,14 +269,14 @@ void XMLTableImport::finishStyles()
 
         Reference< XSingleServiceFactory > xFactory( xTableFamily, UNO_QUERY_THROW );
 
-        for( XMLTableTemplateMap::iterator aTemplateIter( maTableTemplates.begin() ); aTemplateIter != maTableTemplates.end(); aTemplateIter++ ) try
+        for( XMLTableTemplateMap::iterator aTemplateIter( maTableTemplates.begin() ); aTemplateIter != maTableTemplates.end(); ++aTemplateIter ) try
         {
             const OUString sTemplateName( (*aTemplateIter).first );
             Reference< XNameReplace > xTemplate( xFactory->createInstance(), UNO_QUERY_THROW );
 
             boost::shared_ptr< XMLTableTemplate > xT( (*aTemplateIter).second );
 
-            for( XMLTableTemplate::iterator aStyleIter( xT->begin() ); aStyleIter != xT->end(); aStyleIter++ ) try
+            for( XMLTableTemplate::iterator aStyleIter( xT->begin() ); aStyleIter != xT->end(); ++aStyleIter ) try
             {
                 const OUString sPropName( (*aStyleIter).first );
                 const OUString sStyleName( (*aStyleIter).second );
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 57c0ccf668bc..b6f3bdb58e41 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2603,7 +2603,7 @@ sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
         Impl::BookmarkVector_t::iterator it(m_pImpl->m_BookmarkVector.begin());
         while (it != m_pImpl->m_BookmarkVector.end() && it->compareTo(sName)!=0)
         {
-            it++;
+            ++it;
         }
         if (it!=m_pImpl->m_BookmarkVector.end()) {
             m_pImpl->m_BookmarkVector.erase(it);