[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source

[Markus Mohrhard]

 oox/source/export/drawingml.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ea2f86339a3affa643f0f0d81dc79041af06089f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 5 21:35:07 2013 +0200

    let us be explicit about default values
    
    Different MSO versions behave differently in respect to the default
    values. 2007 is not compliant to OOXML and is what our export filter
    expects, 2010+ are compliant to OOXML and therefore our charts look
    awful.
    
    Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0
    (cherry picked from commit 93abb2082ad3cae1432d69b65a89dace6646785a)
    Reviewed-on: https://gerrit.libreoffice.org/3793
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4eefc90..611dcbe 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1500,8 +1500,7 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     FillStyle aFillStyle( FillStyle_NONE );
     xPropSet->getPropertyValue( S( "FillStyle" ) ) >>= aFillStyle;
 
-    if( aFillStyle == FillStyle_NONE ||
-        aFillStyle == FillStyle_HATCH )
+    if( aFillStyle == FillStyle_HATCH )
         return;
 
     switch( aFillStyle )
@@ -1515,6 +1514,9 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     case ::com::sun::star::drawing::FillStyle_BITMAP :
         WriteBlipFill( xPropSet, S( "FillBitmapURL" ) );
         break;
+    case ::com::sun::star::drawing::FillStyle_NONE:
+        mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
+        break;
     default:
         ;
     }