From e0b2e6e3f767240016133dd2d55e0bfb9192ca39 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 28 May 2015 16:18:34 +0200 Subject: loplugin:loopvartoosmall Change-Id: Icbe68b31d4ab04ca3cd9f572e3598413946a75c7 --- oox/source/crypto/Standard2007Engine.cxx | 2 +- oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 4 ++-- oox/source/drawingml/shape.cxx | 2 +- oox/source/vml/vmlshape.cxx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'oox') diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx index bcaba3052aeb..09035d7409f8 100644 --- a/oox/source/crypto/Standard2007Engine.cxx +++ b/oox/source/crypto/Standard2007Engine.cxx @@ -138,7 +138,7 @@ bool Standard2007Engine::calculateEncryptionKey(const OUString& rPassword) // derive key vector buffer(64, 0x36); - for( sal_uInt32 i = 0; i < hash.size(); ++i ) + for( size_t i = 0; i < hash.size(); ++i ) buffer[i] ^= hash[i]; Digest::sha1(hash, buffer); diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 8edffb9dd2aa..034a76a1e896 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -339,12 +339,12 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, const sal_Int32 nHackyFontHeight=50; const sal_Int32 nHackyFontWidth=20; awt::Size aTotalSize; - for( sal_uInt32 nPara=0; nParagetParagraphs().size(); ++nPara ) + for( size_t nPara=0; nParagetParagraphs().size(); ++nPara ) { aTotalSize.Height += nHackyFontHeight; sal_Int32 nLocalWidth=0; - for( sal_uInt32 nRun=0; nRungetParagraphs().at(nPara)->getRuns().size(); ++nRun ) + for( size_t nRun=0; nRungetParagraphs().at(nPara)->getRuns().size(); ++nRun ) nLocalWidth += pTextBody->getParagraphs().at(nPara)->getRuns().at(nRun)->getText().getLength() * nHackyFontWidth; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 1f10a7460a46..f4e2e41cb730 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -915,7 +915,7 @@ Reference< XShape > Shape::createAndInsert( { Sequence< PropertyValue > aGradientStops( aFillProperties.maGradientProps.maGradientStops.size() ); ::std::map< double, Color >::iterator aIt = aFillProperties.maGradientProps.maGradientStops.begin(); - for( sal_uInt32 i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i ) + for( size_t i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i ) { // for each stop in the gradient definition: // save position diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 6342140dc49a..55b17d99a741 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -939,11 +939,11 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes } aBezierCoords.Coordinates.realloc( aCoordLists.size() ); - for ( unsigned int i = 0; i < aCoordLists.size(); i++ ) + for ( size_t i = 0; i < aCoordLists.size(); i++ ) aBezierCoords.Coordinates[i] = ContainerHelper::vectorToSequence( aCoordLists[i] ); aBezierCoords.Flags.realloc( aFlagLists.size() ); - for ( unsigned int i = 0; i < aFlagLists.size(); i++ ) + for ( size_t i = 0; i < aFlagLists.size(); i++ ) aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( aFlagLists[i] ); if( !aCoordLists.front().empty() && !aCoordLists.back().empty() -- cgit