diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-28 12:22:07 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-30 08:13:18 +0200 |
| commit | fbe09a2a02fba03eaa6c649d0ca08cd0df73c7e2 (patch) | |
| tree | 51d8de7db5fbf04218ca0b01525e7d0b154caa93 /oox | |
| parent | e5cdc76a7e28a886ab44d1c315a6661d1d88da0f (diff) | |
fix minorTickMark MSO 2007 vs OOXML default value
Change-Id: Idedf9155605df529f496ceb1ac6b740bc4b2101c
Diffstat (limited to 'oox')
| -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 f04c0ada82a3..618e3e8bce40 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -118,8 +118,7 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At case C_TOKEN( minorGridlines ): return new ShapePrWrapperContext( *this, mrModel.mxMinorGridLines.create() ); case C_TOKEN( minorTickMark ): - // default is 'none', not 'cross' as specified - mrModel.mnMinorTickMark = rAttribs.getToken( XML_val, XML_none ); + mrModel.mnMinorTickMark = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_none : XML_cross ); return 0; case C_TOKEN( numFmt ): mrModel.maNumberFormat.setAttributes( rAttribs ); diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index 45c1a46c2a84..2ff6bf7b31f0 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -42,7 +42,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : mnLabelOffset( 100 ), mnMajorTickMark( bMSO2007Doc ? XML_out : XML_cross ), mnMajorTimeUnit( XML_days ), - mnMinorTickMark( XML_none ), + mnMinorTickMark( bMSO2007Doc ? XML_none : XML_cross ), mnMinorTimeUnit( XML_days ), mnOrientation( XML_minMax ), mnTickLabelPos( XML_nextTo ), |