summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-04-01 18:47:29 +0200
committerJulien Nabet <serval2412@yahoo.fr>2013-04-01 18:47:29 +0200
commitabcf4fec9be9490b7062e57dd56422baf4d640c5 (patch)
tree593bfd28b5b687e18e9fdb58270f1dc35a344efb /oox
parent182059964fb566c16348b6bec0869a19894bfdc7 (diff)
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I59a332c96793ced08bb509776dbcb8fd6c9d2ab9
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/slidepersist.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 92be16e10da5..ddba98e6a43b 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -124,12 +124,14 @@ void SlidePersist::createXShapes( XmlFilterBase& rFilterBase )
Reference< XShapes > xShapes( getPage(), UNO_QUERY );
std::vector< oox::drawingml::ShapePtr >& rShapes( maShapesPtr->getChildren() );
- std::vector< oox::drawingml::ShapePtr >::iterator aShapesIter( rShapes.begin() );
- while( aShapesIter != rShapes.end() )
+ const std::vector< oox::drawingml::ShapePtr >::const_iterator aShapesEnd( rShapes.end() );
+ for (std::vector< oox::drawingml::ShapePtr >::const_iterator aShapesIter( rShapes.begin() );
+ aShapesIter != aShapesEnd ; ++aShapesIter)
{
- std::vector< oox::drawingml::ShapePtr >& rChildren( (*aShapesIter++)->getChildren() );
- std::vector< oox::drawingml::ShapePtr >::iterator aChildIter( rChildren.begin() );
- while( aChildIter != rChildren.end() )
+ std::vector< oox::drawingml::ShapePtr >& rChildren( (*aShapesIter)->getChildren() );
+ const std::vector< oox::drawingml::ShapePtr >::const_iterator aChildEnd( rChildren.end() );
+ for (std::vector< oox::drawingml::ShapePtr >::const_iterator aChildIter( rChildren.begin() );
+ aChildIter != aChildEnd ; ++aChildIter)
{
PPTShape* pPPTShape = dynamic_cast< PPTShape* >( (*aChildIter).get() );
basegfx::B2DHomMatrix aTransformation;
@@ -137,7 +139,6 @@ void SlidePersist::createXShapes( XmlFilterBase& rFilterBase )
pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, aTransformation, 0, &getShapeMap() );
else
(*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, aTransformation, maShapesPtr->getFillProperties(), 0, &getShapeMap() );
- aChildIter++;
}
}