diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2015-01-10 15:52:17 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:45:19 +0000 |
| commit | d5f48d742ac1fea9fd341244bbcea09bcd78b476 (patch) | |
| tree | e68143fca184da493e368081981d666bad8bd906 /svtools/source/misc | |
| parent | babe4ab629d476bbddbacb85c33436ba09655aea (diff) | |
fdo#39440 reduce scope of local variables
This addresses some cppcheck warnings.
Change-Id: I46b9293eed0cba2ebca119cc1fb0a6334ea66308
Reviewed-on: https://gerrit.libreoffice.org/13844
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/imap.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/imap2.cxx | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 37f794cc0d3d..d3174ee7d276 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -537,10 +537,11 @@ bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) const Polygon& rEqPoly = rEqObj.aPoly; const sal_uInt16 nCount = aPoly.GetSize(); const sal_uInt16 nEqCount = rEqPoly.GetSize(); - bool bDifferent = false; if ( nCount == nEqCount ) { + bool bDifferent = false; + for ( sal_uInt16 i = 0; i < nCount; i++ ) { if ( aPoly[ i ] != rEqPoly[ i ] ) @@ -865,12 +866,11 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY ) void ImageMap::ImpWriteImageMap( SvStream& rOStm, const OUString& rBaseURL ) const { - IMapObject* pObj; size_t nCount = maList.size(); for ( size_t i = 0; i < nCount; i++ ) { - pObj = maList[ i ]; + IMapObject* pObj = maList[ i ]; pObj->Write( rOStm, rBaseURL ); } } diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 3164f8a57e36..5edf20315975 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -157,12 +157,11 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseU void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const { - IMapObject* pObj; size_t nCount = maList.size(); for ( size_t i = 0; i < nCount; i++ ) { - pObj = maList[ i ]; + IMapObject* pObj = maList[ i ]; switch( pObj->GetType() ) { @@ -186,12 +185,11 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const { - IMapObject* pObj; size_t nCount = maList.size(); for ( size_t i = 0; i < nCount; i++ ) { - pObj = maList[ i ]; + IMapObject* pObj = maList[ i ]; switch( pObj->GetType() ) { |