diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-27 11:07:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-27 11:07:43 +0000 |
| commit | de72a4c331c6f781262de036be42e6d50ecc2133 (patch) | |
| tree | 6e44ad350a00cf1e7129bfda9b96d8bfc2cac407 /sd/source/ui/annotations | |
| parent | bd30a2a43e66a29000e722b6f35d948ee7605098 (diff) | |
cppcheck: use prefix form
Diffstat (limited to 'sd/source/ui/annotations')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index e9fc1ea4d9e3..0cfc62537d98 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -398,7 +398,7 @@ void AnnotationManagerImpl::InsertAnnotation() Rectangle aNewRect( x, y, x + width - 1, y + height - 1 ); bool bFree = true; - for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter ) { RealPoint2D aPoint( (*iter)->getPosition() ); aTagRect.nLeft = sal::static_int_cast< long >( aPoint.X * 100.0 ); @@ -554,7 +554,7 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAut if( pPage && !pPage->getAnnotations().empty() ) { AnnotationVector aAnnotations( pPage->getAnnotations() ); - for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter ) { Reference< XAnnotation > xAnnotation( *iter ); if( xAnnotation->getAuthor() == sAuthor ) @@ -585,7 +585,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations() { AnnotationVector aAnnotations( pPage->getAnnotations() ); - for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter ) { pPage->removeAnnotation( (*iter) ); } @@ -663,11 +663,11 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { if( xCurrent.is() ) { - for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter ) { if( (*iter) == xCurrent ) { - iter++; + ++iter; if( iter != aAnnotations.end() ) { SelectAnnotation( (*iter) ); @@ -687,20 +687,19 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { if( xCurrent.is() ) { - for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) - { - if( (*iter) == xCurrent ) - { - if( iter != aAnnotations.begin() ) - { - iter--; + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter ) + { + if( (*iter) == xCurrent ) + { + if( iter != aAnnotations.begin() ) + { + --iter; SelectAnnotation( (*iter) ); return; - - } - break; - } - } + } + break; + } + } } else if( !aAnnotations.empty() ) { |