diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-28 12:19:26 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-30 08:13:17 +0200 |
| commit | e5cdc76a7e28a886ab44d1c315a6661d1d88da0f (patch) | |
| tree | 048ca373c364d94735de504022746edd00d1ded1 /oox/source | |
| parent | 7a8ef88e177618a75cb51e31b31d6295aad3f7b1 (diff) | |
fix majorTickMark MSO 2007 vs OOXML default value
Change-Id: I7357ad7e01270653f67ec2140643f5542e7da7ad
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/chart/axiscontext.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/axismodel.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index fec27853c060..f04c0ada82a3 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -113,8 +113,7 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At case C_TOKEN( majorGridlines ): return new ShapePrWrapperContext( *this, mrModel.mxMajorGridLines.create() ); case C_TOKEN( majorTickMark ): - // default is 'out', not 'cross' as specified - mrModel.mnMajorTickMark = rAttribs.getToken( XML_val, XML_out ); + mrModel.mnMajorTickMark = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_out : XML_cross ); return 0; case C_TOKEN( minorGridlines ): return new ShapePrWrapperContext( *this, mrModel.mxMinorGridLines.create() ); diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index 7541a4ea848b..45c1a46c2a84 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -40,7 +40,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : mnCrossMode( XML_autoZero ), mnLabelAlign( XML_ctr ), mnLabelOffset( 100 ), - mnMajorTickMark( XML_out ), + mnMajorTickMark( bMSO2007Doc ? XML_out : XML_cross ), mnMajorTimeUnit( XML_days ), mnMinorTickMark( XML_none ), mnMinorTimeUnit( XML_days ), |