[ooo-build-commit] patches/dev300

[Cédric Bosdonnat]

 patches/dev300/docx-vml-import.diff |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 286e34bab337c81d0698509aeda6274e41e8b508
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Dec 2 15:47:39 2009 +0100

    Fixed a regression on image import in docx
    
    * patches/dev300/docx-vml-import.diff:

diff --git a/patches/dev300/docx-vml-import.diff b/patches/dev300/docx-vml-import.diff
index cd40503..7a75f9d 100644
--- a/patches/dev300/docx-vml-import.diff
+++ b/patches/dev300/docx-vml-import.diff
@@ -82,10 +82,10 @@ index dbc5e1a..3b63685 100644
  } // namespace oox
  
 diff --git oox/source/shape/ShapeContextHandler.cxx oox/source/shape/ShapeContextHandler.cxx
-index 71c2558..74c42ff 100644
+index 71c2558..a57ad32 100644
 --- oox/source/shape/ShapeContextHandler.cxx
 +++ oox/source/shape/ShapeContextHandler.cxx
-@@ -240,7 +240,10 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
+@@ -240,12 +240,16 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
          {
              mpDrawing->finalizeFragmentImport();
              if( const ::oox::vml::ShapeBase* pShape = mpDrawing->getShapes().getFirstShape() )
@@ -96,6 +96,12 @@ index 71c2558..74c42ff 100644
          }
          else if (mpShape.get() != NULL)
          {
+             mpShape->addShape(*mxFilterBase, mpThemePtr, xShapes);
+             xResult.set(mpShape->getXShape());
++            mxGraphicShapeContext.clear( );
+         }
+     }
+ 
 diff --git oox/source/vml/vmldrawingfragment.cxx oox/source/vml/vmldrawingfragment.cxx
 index 6eab7ef..67fabce 100644
 --- oox/source/vml/vmldrawingfragment.cxx