diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-04-20 19:44:09 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-04-20 18:34:45 +0000 |
| commit | 5bb308a9ad16f6002486a60e4a753693818580b6 (patch) | |
| tree | ec0418a72a13492835eb71b810719615e448798f /svx/source/customshapes | |
| parent | b7e3c63f1a384a278da4f6515f5279dbd5f46772 (diff) | |
Revert partly some of my previous patches
to avoid invalidation of end iterators
Change-Id: I0970b6d753ee1dd1f4805d0d27b8eb4f8210581b
Reviewed-on: https://gerrit.libreoffice.org/24265
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 8f7d6b654445..f4f1ed2ed981 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -724,9 +724,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con pScene->SetLogicRect( CalculateNewSnapRect( pCustomShape, aSnapRect, aBoundRect2d, pMap ) ); // removing placeholder objects - std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() ); - std::vector< E3dCompoundObject* >::const_iterator aEnd( aPlaceholderObjectList.end() ); - while ( aObjectListIter != aEnd ) + for (std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() ); aObjectListIter != aPlaceholderObjectList.end(); ) { pScene->Remove3DObj( *aObjectListIter ); delete *aObjectListIter++; |