diff options
author | Muthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com> | 2014-10-10 18:59:46 +0530 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-02-19 11:07:35 +0100 |
commit | bf7ff8f265a8a832e9872f60e8399f7e6d173d00 (patch) | |
tree | 3f99bde62d8343a4f7c6ed7fa9aa875a8f988ab1 | |
parent | 9d0a08542503f7696f7766c791d6718e72725dc7 (diff) |
fdo#54361: Chart background in XLSX is transparent instead of white.
(cherry picked from commit aad90e18cd00ac8af6bcddf14e4e19c9475dedbf)
Conflicts:
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96
-rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 22b99310d490..d6cd258bb860 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -630,7 +630,8 @@ class FillFormatter : public DetailFormatterBase public: explicit FillFormatter( ObjectFormatterData& rData, - const AutoFormatEntry* pAutoFormatEntry ); + const AutoFormatEntry* pAutoFormatEntry, + const ObjectType eObjType ); /** Converts area formatting to the passed property set. */ void convertFormatting( @@ -691,7 +692,8 @@ public: explicit ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, - const ChartSpaceModel& rChartSpace ); + const ChartSpaceModel& rChartSpace, + const ObjectType eObjType ); /** Sets frame formatting properties to the passed property set. */ void convertFrameFormatting( @@ -873,15 +875,14 @@ void LineFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), getPhColor( nSeriesIdx ) ); } -// ============================================================================ - -FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) : +FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry, const ObjectType eObjType ) : DetailFormatterBase( rData, pAutoFormatEntry ) { if( pAutoFormatEntry ) { mxAutoFill.reset( new FillProperties ); - mxAutoFill->moFillType = XML_noFill; + if( eObjType != OBJECTTYPE_CHARTSPACE ) + mxAutoFill->moFillType = XML_noFill; if( const Theme* pTheme = mrData.mrFilter.getCurrentTheme() ) if( const FillProperties* pFillProps = pTheme->getFillStyle( pAutoFormatEntry->mnThemedIdx ) ) *mxAutoFill = *pFillProps; @@ -967,11 +968,9 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te convertFormatting( rPropSet, lclGetTextProperties( rxTextProp ) ); } -// ============================================================================ - -ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace ) : +ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace, const ObjectType eObjType ) : maLineFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoLines, rChartSpace.mnStyle ) ), - maFillFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoFills, rChartSpace.mnStyle ) ), + maFillFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoFills, rChartSpace.mnStyle ), eObjType ), maEffectFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoEffects, rChartSpace.mnStyle ) ), maTextFormatter( rData, lclGetAutoTextEntry( rEntry.mpAutoTexts, rChartSpace.mnStyle ), rChartSpace.mxTextProp ), mrModelObjHelper( rData.maModelObjHelper ), @@ -1024,7 +1023,7 @@ ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Re { const ObjectTypeFormatEntry* pEntryEnd = STATIC_ARRAY_END( spObjTypeFormatEntries ); for( const ObjectTypeFormatEntry* pEntry = spObjTypeFormatEntries; pEntry != pEntryEnd; ++pEntry ) - maTypeFormatters[ pEntry->meObjType ].reset( new ObjectTypeFormatter( *this, *pEntry, rChartSpace ) ); + maTypeFormatters[ pEntry->meObjType ].reset( new ObjectTypeFormatter( *this, *pEntry, rChartSpace, pEntry->meObjType ) ); try { |