diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-06-13 20:35:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-14 09:20:59 +0200 |
| commit | e5fdaa259157c062b5481226e54e6a02bfbeca0d (patch) | |
| tree | 1f225e9e4c71d6b9e5dc533f4e781bb827c6b644 /oox | |
| parent | 271c4e2fe53c6fe159789db27507804133e72814 (diff) | |
fix reading two smartart shapes in one document
Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 0d59ffec3978..241ae868ca2b 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -288,8 +288,8 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) basegfx::B2DHomMatrix aMatrix; if (mpShape->getExtDrawings().size() == 0) { - xResult = mpShape->getXShape(); mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix ); + xResult = mpShape->getXShape(); } else { @@ -305,6 +305,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) } mpShape.reset((Shape*)0); } + mxDiagramShapeContext.clear(); } else if (mpShape.get() != NULL) { |