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:39:40 +0200 |
| commit | cce481aa3184e3b00f7cc6f0a6d2a496ab19a6fd (patch) | |
| tree | 1f05e49ffb3186d62992606f55a253b221569c6f | |
| parent | 5499225ae01f2d1ba0bb655bed343530448ad864 (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 0d3a2868dd3e..97159735c783 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -533,9 +533,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() ); |