bnc#593612: workaround for grpFill

Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc

bnc#593612: workaround for grpFill
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc
3b35ad42 · Felix Zhang · Thorsten Behrens · 2ef24913 · 3b35ad42
Kaydet (Commit) 3b35ad42 authored Tem 01, 2013 tarafından Felix Zhang Kaydeden (comit) Thorsten Behrens Agu 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

shape.cxx oox/source/drawingml/shape.cxx +2 -3

No files found.
--- 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() );