diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-02-22 15:49:17 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-03-04 22:21:21 +0000 |
| commit | 01157183eadc1e1848cad13950ed67feb62fa62a (patch) | |
| tree | d14dec433c5a55e261fd013bfa18ccd576a47dfc /oox | |
| parent | e0331002d39244cf9c8944fe291d1d009f919eb5 (diff) | |
PPTX import: Table cell props: Override default graphic style if applicable.
If no fill type is defined for a table cell, then set it to XML_noFill
explicitly, in order to override the fill type defined by the default
graphic style or the graphic style named standard, added by LO and
exported into ODP.
Change-Id: I9c5aa4c2a939ee7b8c75ae686d845cd14a718254
Reviewed-on: https://gerrit.libreoffice.org/22618
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/table/tablecell.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 8033218c822b..45efa77e7b9e 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -408,6 +408,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo aFillProperties.maFillColor.setSrgbClr(aResult.GetRGBColor()); aFillProperties.moFillType.set(XML_solidFill); } + if (!aFillProperties.moFillType.has()) + aFillProperties.moFillType.set(XML_noFill); // TODO: phClr? aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() ); |