Kaydet (Commit) 5693eb07 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix more mbNoEndCap MSO 2007 vs OOXML places

Change-Id: Ib1002488e880fa1478dceb046cd08b40cdfe7b1e
üst 935f3b99
...@@ -106,7 +106,7 @@ struct ErrorBarModel ...@@ -106,7 +106,7 @@ struct ErrorBarModel
sal_Int32 mnValueType; /// Type of the values. sal_Int32 mnValueType; /// Type of the values.
bool mbNoEndCap; /// True = no end cap at error bar lines. bool mbNoEndCap; /// True = no end cap at error bar lines.
explicit ErrorBarModel(); explicit ErrorBarModel(bool bMSO2007Doc);
~ErrorBarModel(); ~ErrorBarModel();
}; };
......
...@@ -423,7 +423,7 @@ ContextHandlerRef AreaSeriesContext::onCreateContext( sal_Int32 nElement, const ...@@ -423,7 +423,7 @@ ContextHandlerRef AreaSeriesContext::onCreateContext( sal_Int32 nElement, const
case C_TOKEN( cat ): case C_TOKEN( cat ):
return new DataSourceContext( *this, mrModel.maSources.create( SeriesModel::CATEGORIES ) ); return new DataSourceContext( *this, mrModel.maSources.create( SeriesModel::CATEGORIES ) );
case C_TOKEN( errBars ): case C_TOKEN( errBars ):
return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) );
case C_TOKEN( dLbls ): case C_TOKEN( dLbls ):
return new DataLabelsContext( *this, mrModel.mxLabels.create() ); return new DataLabelsContext( *this, mrModel.mxLabels.create() );
case C_TOKEN( dPt ): case C_TOKEN( dPt ):
...@@ -462,7 +462,7 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A ...@@ -462,7 +462,7 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A
case C_TOKEN( dPt ): case C_TOKEN( dPt ):
return new DataPointContext( *this, mrModel.maPoints.create() ); return new DataPointContext( *this, mrModel.maPoints.create() );
case C_TOKEN( errBars ): case C_TOKEN( errBars ):
return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) );
case C_TOKEN( invertIfNegative ): case C_TOKEN( invertIfNegative ):
mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc ); mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc );
return 0; return 0;
...@@ -509,7 +509,7 @@ ContextHandlerRef BubbleSeriesContext::onCreateContext( sal_Int32 nElement, cons ...@@ -509,7 +509,7 @@ ContextHandlerRef BubbleSeriesContext::onCreateContext( sal_Int32 nElement, cons
case C_TOKEN( dPt ): case C_TOKEN( dPt ):
return new DataPointContext( *this, mrModel.maPoints.create() ); return new DataPointContext( *this, mrModel.maPoints.create() );
case C_TOKEN( errBars ): case C_TOKEN( errBars ):
return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) );
case C_TOKEN( invertIfNegative ): case C_TOKEN( invertIfNegative ):
mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc ); mrModel.mbInvertNeg = rAttribs.getBool( XML_val, !bMSO2007Doc );
return 0; return 0;
...@@ -549,7 +549,7 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const ...@@ -549,7 +549,7 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const
case C_TOKEN( dPt ): case C_TOKEN( dPt ):
return new DataPointContext( *this, mrModel.maPoints.create() ); return new DataPointContext( *this, mrModel.maPoints.create() );
case C_TOKEN( errBars ): case C_TOKEN( errBars ):
return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) );
case C_TOKEN( marker ): case C_TOKEN( marker ):
return this; return this;
case C_TOKEN( smooth ): case C_TOKEN( smooth ):
...@@ -656,7 +656,7 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con ...@@ -656,7 +656,7 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con
case C_TOKEN( dPt ): case C_TOKEN( dPt ):
return new DataPointContext( *this, mrModel.maPoints.create() ); return new DataPointContext( *this, mrModel.maPoints.create() );
case C_TOKEN( errBars ): case C_TOKEN( errBars ):
return new ErrorBarContext( *this, mrModel.maErrorBars.create() ); return new ErrorBarContext( *this, mrModel.maErrorBars.create(bMSO2007Doc) );
case C_TOKEN( marker ): case C_TOKEN( marker ):
return this; return this;
case C_TOKEN( smooth ): case C_TOKEN( smooth ):
......
...@@ -64,12 +64,12 @@ PictureOptionsModel::~PictureOptionsModel() ...@@ -64,12 +64,12 @@ PictureOptionsModel::~PictureOptionsModel()
{ {
} }
ErrorBarModel::ErrorBarModel() : ErrorBarModel::ErrorBarModel(bool bMSO2007Doc) :
mfValue( 0.0 ), mfValue( 0.0 ),
mnDirection( XML_y ), mnDirection( XML_y ),
mnTypeId( XML_both ), mnTypeId( XML_both ),
mnValueType( XML_fixedVal ), mnValueType( XML_fixedVal ),
mbNoEndCap( false ) mbNoEndCap( !bMSO2007Doc )
{ {
} }
......
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