diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-27 17:44:46 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-27 18:51:49 +0000 |
| commit | ae79fbd42fd61c878939111a04bca22f84c37e03 (patch) | |
| tree | 28011ab1921f86837ed422f85cb75e0d57669ca5 /oox | |
| parent | 60a596b48d670828c8c71658e45de7296a1848c6 (diff) | |
tdf#104201: PPTX: Group solid fill is not imported
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>
(cherry picked from commit 7c5aaa254f444d54b9ebf6574f0ccd37af548ee5)
Change-Id: Iec273714108598d7017e73a9e7d384f8410d6ee1
Reviewed-on: https://gerrit.libreoffice.org/31266
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 6 |
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; } |