diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-05-13 14:24:06 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-05-13 14:27:55 +0200 |
| commit | 606ed5226e42bbfe684ba2497c797289eea5a4fb (patch) | |
| tree | c1b4b76df202055f2f01d5ad539e938d70dec635 /oox | |
| parent | 72aac559808f9afdb9f65421a76624dab44b1f24 (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.
ACK by Cedric.
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 0c50a13d9c33..7f4135a97a5f 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) |