From 9cc04cb09590cd00395244f81bbf6c3292b99c2b Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 30 Mar 2013 16:20:06 +0100 Subject: Prefer prefix ++/-- operators for non-primitive types + convert while loop in for loop Change-Id: I615e2c724481047b557a4da9bb0753ec6eaecb90 --- oox/source/drawingml/customshapeproperties.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 48173b7c7ffb..aab5cc471f6c 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -169,8 +169,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq ) { - std::vector< CustomShapeGuide >::const_iterator aIter( maAdjustmentGuideList.begin() ); - while( aIter != maAdjustmentGuideList.end() ) + for (std::vector< CustomShapeGuide >::const_iterator aIter( maAdjustmentGuideList.begin() ), aEnd(maAdjustmentGuideList.end()); + aIter != aEnd; ++aIter) { if ( (*aIter).maName.getLength() > 3 ) { @@ -190,7 +190,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi aAdjustmentVal.Name = (*aIter).maName; aAdjustmentSeq[ 0 ] = aAdjustmentVal; } - aIter++; } aGeoPropSeq[ i ].Value <<= aAdjustmentSeq; xPropSet->setPropertyValue( sCustomShapeGeometry, Any( aGeoPropSeq ) ); -- cgit