diff options
| author | Felix Zhang <fezhang@suse.com> | 2013-07-01 17:04:12 +0800 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-08-05 03:38:28 +0200 |
| commit | 774a45341b7b69d6c1ce508e55c23d78efa43871 (patch) | |
| tree | 31ae86547f3d2dfdae72342f85def2e21ba9b636 | |
| parent | 9390bbfd6e0dd1dc2d007bd391b186d7bf4c86ea (diff) | |
bnc#593612: workaround for grpFill
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc
(cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67)
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 6c30d12a079f..dc2a7db1aa06 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -524,9 +524,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() ); |