diff options
| author | Noel Power <noel.power@suse.com> | 2013-03-12 20:37:15 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-03-13 09:54:03 +0000 |
| commit | 1dbd088e4fb9597b0e2f5e4c4db6ecf047d85da3 (patch) | |
| tree | 736a3c966e379f34674df53f9e04afaeb0c5ece2 /oox/source/shape | |
| parent | 856756ec77ac64d1caee6c1b80c3641d4e487b2d (diff) | |
bnc#798309 inherit group style from parent
Change-Id: Ie4f1d244f1c9b4935305742d12cabaee3e38647c
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 6b62396a8feb..9c8da2d0549d 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -290,7 +290,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) basegfx::B2DHomMatrix aMatrix; if (mpShape->getExtDrawings().size() == 0) { - mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix ); + mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, mpShape->getFillProperties() ); xResult = mpShape->getXShape(); } else @@ -302,7 +302,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) OUString aFragmentPath(pDiagramGraphicDataContext->getFragmentPathFromRelId(*aIt)); oox::drawingml::ShapePtr pShapePtr( new Shape( "com.sun.star.drawing.GroupShape" ) ); mxFilterBase->importFragment(new ShapeDrawingFragmentHandler(*mxFilterBase, aFragmentPath, pShapePtr)); - pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix ); + pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() ); xResult = pShapePtr->getXShape(); } mpShape.reset((Shape*)0); @@ -312,7 +312,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) else if (mpShape.get() != NULL) { basegfx::B2DHomMatrix aTransformation; - mpShape->addShape(*mxFilterBase, mpThemePtr.get(), xShapes, aTransformation); + mpShape->addShape(*mxFilterBase, mpThemePtr.get(), xShapes, aTransformation, mpShape->getFillProperties() ); xResult.set(mpShape->getXShape()); mxGraphicShapeContext.clear( ); } |