summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTamás Zolnai <zolnaitamas2000@gmail.com>2016-11-27 15:35:53 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2016-11-27 15:24:35 +0000
commit7c5aaa254f444d54b9ebf6574f0ccd37af548ee5 (patch)
tree3bbd9ab2d1e76be350f720b04728d7c1c9ed3469 /oox
parent78547c337461a77522b4733908bcbc77e66b2657 (diff)
tdf#104201: PPTX: Group solid fill is not imported
Change-Id: Iec273714108598d7017e73a9e7d384f8410d6ee1 Reviewed-on: https://gerrit.libreoffice.org/31263 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0ee6cef28eef..cd564964af35 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1462,14 +1462,14 @@ FillProperties Shape::getActualFillProperties(const Theme* pTheme, const FillPro
}
}
+ // Properties specified directly for this shape
+ aFillProperties.assignUsed(getFillProperties());
+
// Parent shape's properties
if ( pParentShapeFillProps != nullptr)
if( getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill )
aFillProperties.assignUsed( *pParentShapeFillProps );
- // Properties specified directly for this shape
- aFillProperties.assignUsed( getFillProperties() );
-
return aFillProperties;
}