[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source

[Felix Zhang]

 oox/source/drawingml/shape.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit cce481aa3184e3b00f7cc6f0a6d2a496ab19a6fd
Author: Felix Zhang <fezhang at suse.com>
Date:   Mon Jul 1 17:04:12 2013 +0800

    bnc#593612: workaround for grpFill
    
    Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc
    (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67)
    
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0d3a286..9715973 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() );