oox/source/drawingml/shape.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 774a45341b7b69d6c1ce508e55c23d78efa43871
Author: Felix Zhang <fezh...@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 <tbehr...@suse.com>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 6c30d12..dc2a7db 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() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
