summaryrefslogtreecommitdiff
path: root/oox/source/shape
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2011-05-13 14:24:06 +0200
committerLuboš Luňák <l.lunak@suse.cz>2011-05-13 14:26:59 +0200
commitc9793b70152ba299aa7cc9a0b57739fc4c3b06ab (patch)
tree5fae3a321154394725139630cd897eed795e4cf5 /oox/source/shape
parentc1c92569ba70dafeaa8ee83bdd18837c1500c070 (diff)
avoid deleting before a use (bnc#693200)
The call to clearShapes() cleared the list and deleted items, which was what pShape was pointing to -> crash.
Diffstat (limited to 'oox/source/shape')
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 3be9a562bcee..de27734a89d8 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -246,8 +246,8 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
mpDrawing->finalizeFragmentImport();
if( const ::oox::vml::ShapeBase* pShape = mpDrawing->getShapes().getFirstShape() )
{
- mpDrawing->getShapes( ).clearShapes( );
xResult = pShape->convertAndInsert( xShapes );
+ mpDrawing->getShapes( ).clearShapes( );
}
}
else if (mpShape.get() != NULL)