diff options
| author | Noel Power <noel.power@novell.com> | 2011-02-22 11:23:18 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-02-22 11:32:36 +0000 |
| commit | c1c4bf9b6069541d27f9472c23dbc0ad39752e2d (patch) | |
| tree | a4d19cf79f3677f168530ff22c3a55f0f9bbcb60 | |
| parent | 0325c492a9cb78308deabe64a39a823be25a9aa4 (diff) | |
fdo#34305 fix missing jpg/gif in docx import
| -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 3dbe275b2..2b2781c2e 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() ) |