[Libreoffice-commits] core.git: oox/source

[Felix Zhang]

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

New commits:
commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67
Author: Felix Zhang <fezh...@suse.com>
Date:   Mon Jul 1 17:04:12 2013 +0800

    bnc#593612: workaround for grpFill
    
    Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1a1a1e1..64a7ab5 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() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits