[Libreoffice-commits] .: oox/source

[Noel Power]

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

New commits:
commit c1c4bf9b6069541d27f9472c23dbc0ad39752e2d
Author: Noel Power <noel.power at novell.com>
Date:   Tue Feb 22 11:23:18 2011 +0000

    fdo#34305 fix missing jpg/gif in docx import

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 3dbe275..2b2781c 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -31,6 +31,7 @@
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
 #include "tokens.hxx"
+#include "oox/token/tokenmap.hxx"
 
 namespace oox { namespace shape {
 
@@ -223,7 +224,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
 
     if (mxFilterBase.is() && xShapes.is())
     {
-        if (mpDrawing.get() != NULL)
+        if ( getContextHandler() == getDrawingShapeContext() )
         {
             mpDrawing->finalizeFragmentImport();
             if( const ::oox::vml::ShapeBase* pShape = mpDrawing->getShapes().getFirstShape() )