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

fix minorTickMark MSO 2007 vs OOXML default value

Change-Id: Idedf9155605df529f496ceb1ac6b740bc4b2101c
üst e5cdc76a
...@@ -118,8 +118,7 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At ...@@ -118,8 +118,7 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At
case C_TOKEN( minorGridlines ): case C_TOKEN( minorGridlines ):
return new ShapePrWrapperContext( *this, mrModel.mxMinorGridLines.create() ); return new ShapePrWrapperContext( *this, mrModel.mxMinorGridLines.create() );
case C_TOKEN( minorTickMark ): case C_TOKEN( minorTickMark ):
// default is 'none', not 'cross' as specified mrModel.mnMinorTickMark = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_none : XML_cross );
mrModel.mnMinorTickMark = rAttribs.getToken( XML_val, XML_none );
return 0; return 0;
case C_TOKEN( numFmt ): case C_TOKEN( numFmt ):
mrModel.maNumberFormat.setAttributes( rAttribs ); mrModel.maNumberFormat.setAttributes( rAttribs );
......
...@@ -42,7 +42,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : ...@@ -42,7 +42,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId, bool bMSO2007Doc ) :
mnLabelOffset( 100 ), mnLabelOffset( 100 ),
mnMajorTickMark( bMSO2007Doc ? XML_out : XML_cross ), mnMajorTickMark( bMSO2007Doc ? XML_out : XML_cross ),
mnMajorTimeUnit( XML_days ), mnMajorTimeUnit( XML_days ),
mnMinorTickMark( XML_none ), mnMinorTickMark( bMSO2007Doc ? XML_none : XML_cross ),
mnMinorTimeUnit( XML_days ), mnMinorTimeUnit( XML_days ),
mnOrientation( XML_minMax ), mnOrientation( XML_minMax ),
mnTickLabelPos( XML_nextTo ), mnTickLabelPos( XML_nextTo ),
......
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