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

[Matus Uzak]

 oox/source/drawingml/table/tablecell.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 01157183eadc1e1848cad13950ed67feb62fa62a
Author: Matus Uzak <matus.uzak at gmail.com>
Date:   Mon Feb 22 15:49:17 2016 +0100

    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 at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 8033218..45efa77 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() );