diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-04-22 17:14:36 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-04-22 17:14:36 +0200 |
| commit | 2f411e16ce9f9aacc428528d3a5bffc3bd20978a (patch) | |
| tree | fa33f496fbedc43d991502af9c09413e73e75318 /oox/source/shape | |
| parent | 1fc65a6e2ec37bfc643538c30bdf16dec98838b7 (diff) | |
| parent | 17e7675fe6fccf5a0f084bb9f7bceb4f663f8e3b (diff) | |
cbosdo03: merge with DEV300_m77
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 1367383049f1..21258999d327 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -69,7 +69,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) case XML_graphic: mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" )); mxGraphicShapeContext.set - (new GraphicalObjectFrameContext(*rFragmentHandler, pMasterShape, mpShape)); + (new GraphicalObjectFrameContext(*rFragmentHandler, pMasterShape, mpShape, true)); break; case XML_pic: mpShape.reset(new Shape("com.sun.star.drawing.GraphicObjectShape" )); @@ -229,7 +229,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) } else if (mpShape.get() != NULL) { - mpShape->addShape(*mxFilterBase, mpThemePtr, xShapes); + mpShape->addShape(*mxFilterBase, mpThemePtr.get(), xShapes); xResult.set(mpShape->getXShape()); mxGraphicShapeContext.clear( ); } |