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:24:37 +0200 |
| commit | 6f7324ba6b9c21d1b4cda60878c4dcfbf6767277 (patch) | |
| tree | c3f800a33e81cf85b6f7435d85bf5c0c820eff74 /oox | |
| parent | 968bdedd8f8647945b1742f728a7ec7ab0733207 (diff) | |
fix reading two smartart shapes in one document
Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
(cherry picked from commit e5fdaa259157c062b5481226e54e6a02bfbeca0d)
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) { |