[PATCH libreoffice-4-0] let us be explicit about default values

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3793

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3793/1

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)
---
M oox/source/export/drawingml.cxx
1 file changed, 4 insertions(+), 2 deletions(-)



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 @@
     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 @@
     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:
         ;
     }

-- 
To view, visit https://gerrit.libreoffice.org/3793
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard <markus.mohrhard at googlemail.com>