diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-20 05:02:50 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-21 06:44:27 +0200 |
| commit | 3df94a9272260cd839f6aec69d9f4914fc1ba565 (patch) | |
| tree | 0b30e9439cd482e4c2fb810fcfecfeadb453f29c /oox/source/drawingml | |
| parent | 0c8e924a078f7ac70643be3965ff0b3a0eed240a (diff) | |
more smooth MSO 2007 vs OOXML cases
Change-Id: I931eca79499c566e953abeca0b9ba451937e5a33
Diffstat (limited to 'oox/source/drawingml')
| -rw-r--r-- | oox/source/drawingml/chart/seriescontext.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 5baa458561aa..f9f59c319f50 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -556,7 +556,6 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): - // MSO 2007 writes false by default and not true mrModel.mbSmooth = rAttribs.getBool( XML_val, !bMSO2007Doc ); return 0; case C_TOKEN( trendline ): @@ -613,6 +612,7 @@ RadarSeriesContext::~RadarSeriesContext() ContextHandlerRef RadarSeriesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { + bool bMSO2007Doc = getFilter().isMSO2007Document(); switch( getCurrentElement() ) { case C_TOKEN( ser ): @@ -627,9 +627,7 @@ ContextHandlerRef RadarSeriesContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): - // TODO: OOXML_spec - // MSO 2007 writes false by default and not true - mrModel.mbSmooth = rAttribs.getBool( XML_val, true ); + mrModel.mbSmooth = rAttribs.getBool( XML_val, bMSO2007Doc ); return 0; case C_TOKEN( val ): return new DataSourceContext( *this, mrModel.maSources.create( SeriesModel::VALUES ) ); @@ -650,6 +648,7 @@ ScatterSeriesContext::~ScatterSeriesContext() ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { + bool bMSO2007Doc = getFilter().isMSO2007Document(); switch( getCurrentElement() ) { case C_TOKEN( ser ): @@ -664,9 +663,7 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): - // TODO: OOXML_spec - // MSO 2007 writes false by default and not true - mrModel.mbSmooth = rAttribs.getBool( XML_val, true ); + mrModel.mbSmooth = rAttribs.getBool( XML_val, !bMSO2007Doc ); return 0; case C_TOKEN( trendline ): return new TrendlineContext( *this, mrModel.maTrendlines.create() ); |