summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Zhang <fezhang@suse.com>2013-07-01 17:04:12 +0800
committerThorsten Behrens <tbehrens@suse.com>2013-08-05 03:37:05 +0200
commit3b35ad42ed8bea8cab32e2131c81b03c8347cb67 (patch)
treea28af65d584e06323d72a55336282533501a582c
parent2ef249134e8696a15d2caf2eab5f2e5e211e01a7 (diff)
bnc#593612: workaround for grpFill
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc
-rw-r--r--oox/source/drawingml/shape.cxx5
1 files changed, 2 insertions, 3 deletions
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() );