Skip to content

C
core
Kaydet (Commit) e5fdaa25 authored tarafından Luboš Luňák's avatar Luboš Luňák Kaydeden (comit) Miklos Vajna
Dosyalara gözat
Seçenekler

fix reading two smartart shapes in one document 

Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
üst 271c4e2f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
oox/source/shape/ShapeContextHandler.cxx
Dosyayı görüntüle @ e5fdaa25
...@@ -288,8 +288,8 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) ...@@ -288,8 +288,8 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
basegfx::B2DHomMatrix aMatrix; basegfx::B2DHomMatrix aMatrix;
if (mpShape->getExtDrawings().size() == 0) if (mpShape->getExtDrawings().size() == 0)
{ {
xResult = mpShape->getXShape();
mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix ); mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix );
xResult = mpShape->getXShape();
} }
else else
{ {
...@@ -305,6 +305,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) ...@@ -305,6 +305,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
} }
mpShape.reset((Shape*)0); mpShape.reset((Shape*)0);
} }
mxDiagramShapeContext.clear();
} }
else if (mpShape.get() != NULL) else if (mpShape.get() != NULL)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment