From 3b35ad42ed8bea8cab32e2131c81b03c8347cb67 Mon Sep 17 00:00:00 2001 From: Felix Zhang <fezhang@suse.com> Date: Mon, 1 Jul 2013 17:04:12 +0800 Subject: bnc#593612: workaround for grpFill Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc --- oox/source/drawingml/shape.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'oox/source') diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 1a1a1e1788aa..64a7ab5df0a1 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -534,9 +534,8 @@ Reference< XShape > Shape::createAndInsert( // group fill inherits from parent if ( getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill ) - aFillProperties.assignUsed( rShapeOrParentShapeFillProps ); - else - aFillProperties.assignUsed( getFillProperties() ); + getFillProperties().assignUsed( rShapeOrParentShapeFillProps ); + aFillProperties.assignUsed( getFillProperties() ); aEffectProperties.assignUsed ( getEffectProperties() ); ShapePropertyMap aShapeProps( rFilterBase.getModelObjectHelper() ); -- cgit