diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2012-05-19 15:09:08 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2012-05-19 15:10:13 +0200 |
commit | 2b657f5844f9362660c253322e4c4059d5875062 (patch) | |
tree | 1c87a789b24a38f85af13b6d76d370abbf6a7974 /sd/source | |
parent | 891f032e85276a86783787ecfeb5a462db34093b (diff) |
Fix Prefer prefix ++/-- operators for non-primitive types
Change-Id: I4ebb1027151c3bc34f81fb1e13de6c4c5cfed54d
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 18 | ||||
-rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/shapelist.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlpool.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 2 |
8 files changed, 19 insertions, 19 deletions
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; } |