diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-20 20:54:20 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-21 06:44:30 +0200 |
| commit | 5693eb07f645bef934c2e16ba252298d304ff420 (patch) | |
| tree | 14a7ee2a05e8e8da671483bcfc52fc54fc89e349 /oox/source | |
| parent | 935f3b9993bfb76560c07ba0d39df4ce21e58518 (diff) | |
fix more mbNoEndCap MSO 2007 vs OOXML places
Change-Id: Ib1002488e880fa1478dceb046cd08b40cdfe7b1e
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/chart/seriescontext.cxx | 10 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/seriesmodel.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 6a7ac2909c73..2f69812464e9 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -423,7 +423,7 @@ ContextHandlerRef AreaSeriesContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( cat ): return new DataSourceContext( *this, mrModel.maSources.create( SeriesModel::CATEGORIES ) ); case C_TOKEN( errBars ): - return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); + return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) ); case C_TOKEN( dLbls ): return new DataLabelsContext( *this, mrModel.mxLabels.create() ); case C_TOKEN( dPt ): @@ -462,7 +462,7 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A case C_TOKEN( dPt ): return new DataPointContext( *this, mrModel.maPoints.create() ); case C_TOKEN( errBars ): - return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); + return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) ); case C_TOKEN( invertIfNegative ): mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc ); return 0; @@ -509,7 +509,7 @@ ContextHandlerRef BubbleSeriesContext::onCreateContext( sal_Int32 nElement, cons case C_TOKEN( dPt ): return new DataPointContext( *this, mrModel.maPoints.create() ); case C_TOKEN( errBars ): - return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); + return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) ); case C_TOKEN( invertIfNegative ): mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc ); return 0; @@ -549,7 +549,7 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( dPt ): return new DataPointContext( *this, mrModel.maPoints.create() ); case C_TOKEN( errBars ): - return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); + return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) ); case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): @@ -656,7 +656,7 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con case C_TOKEN( dPt ): return new DataPointContext( *this, mrModel.maPoints.create() ); case C_TOKEN( errBars ): - return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); + return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) ); case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index 5507384a8563..79ec3cf752cd 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -64,12 +64,12 @@ PictureOptionsModel::~PictureOptionsModel() { } -ErrorBarModel::ErrorBarModel() : +ErrorBarModel::ErrorBarModel(bool bMSO2007Doc) : mfValue( 0.0 ), mnDirection( XML_y ), mnTypeId( XML_both ), mnValueType( XML_fixedVal ), - mbNoEndCap( false ) + mbNoEndCap( !bMSO2007Doc ) { } |