Kaydet (Commit) 29d303b7 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Petr Mladek

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 93abb208)
Reviewed-on: https://gerrit.libreoffice.org/3793Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst 992f74f4
...@@ -1500,8 +1500,7 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet ) ...@@ -1500,8 +1500,7 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
FillStyle aFillStyle( FillStyle_NONE ); FillStyle aFillStyle( FillStyle_NONE );
xPropSet->getPropertyValue( S( "FillStyle" ) ) >>= aFillStyle; xPropSet->getPropertyValue( S( "FillStyle" ) ) >>= aFillStyle;
if( aFillStyle == FillStyle_NONE || if( aFillStyle == FillStyle_HATCH )
aFillStyle == FillStyle_HATCH )
return; return;
switch( aFillStyle ) switch( aFillStyle )
...@@ -1515,6 +1514,9 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet ) ...@@ -1515,6 +1514,9 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
case ::com::sun::star::drawing::FillStyle_BITMAP : case ::com::sun::star::drawing::FillStyle_BITMAP :
WriteBlipFill( xPropSet, S( "FillBitmapURL" ) ); WriteBlipFill( xPropSet, S( "FillBitmapURL" ) );
break; break;
case ::com::sun::star::drawing::FillStyle_NONE:
mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
break;
default: default:
; ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment