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 | b9834274194db5b94e92a77b4e8cc49af7956d3f (patch) | |
| tree | db4ad60359ed53361b150ced389c5a1d0bc60246 /oox/source/shape | |
| parent | aed8cfe897b91d83c9702cf4038652a01adb103e (diff) | |
fdo#34305 fix missing jpg/gif in docx import
Diffstat (limited to 'oox/source/shape')
| -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 2a52aec3e29d..0dfc33fb73b2 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() ) |