diff options
| author | Muthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com> | 2014-10-10 18:59:46 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:30:44 +0100 |
| commit | aff51f782244fe1061b29a11108229379905433f (patch) | |
| tree | 9ec12dc7f3564a79ffe96804872179a2f3affed5 /oox | |
| parent | c24504d066de303f46b24c07a37810857324797d (diff) | |
fdo#54361: Chart background in XLSX is transparent instead of white.
Conflicts:
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96
Reviewed-on: https://gerrit.libreoffice.org/11910
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'oox')
| -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 ae455505ad4d..53328b9dee83 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -643,7 +643,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( @@ -704,7 +705,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( @@ -886,15 +888,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; @@ -975,11 +976,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 ), @@ -1032,7 +1031,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 { |