[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

[Miklos Vajna]

 oox/source/shape/ShapeContextHandler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6f7324ba6b9c21d1b4cda60878c4dcfbf6767277
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jun 13 20:35:07 2012 +0200

    fix reading two smartart shapes in one document
    
    Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
    (cherry picked from commit e5fdaa259157c062b5481226e54e6a02bfbeca0d)

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 0d59ffe..241ae86 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)
         {