diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-09-19 15:15:58 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-09-23 15:53:14 +0200 |
| commit | 830e539547c463b932ce643517f880789185032d (patch) | |
| tree | 9821b48984af82e31edfaa2f5bc0e65a92fd3467 /oox | |
| parent | 9f1352381eb54d3fc822cd56060a69bd51f62a21 (diff) | |
tdf#127393 OOXML chart import: fix X axis position setting "CrossBetween"
Set ShiftedCategoryPosition according to OOXML value CrossBetween.
Change-Id: I6445c94507de83f84b08fd3380cbbf03886b5aa3
Reviewed-on: https://gerrit.libreoffice.org/79142
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/axiscontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/axisconverter.cxx | 1 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/axismodel.cxx | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index b3181d8a6cda..45f61a9a019c 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -281,7 +281,7 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att if( isRootElement() ) switch( nElement ) { case C_TOKEN( crossBetween ): - mrModel.mnCrossBetween = rAttribs.getToken( XML_val, XML_between ); + mrModel.mnCrossBetween = rAttribs.getToken( XML_val, -1 ); return nullptr; case C_TOKEN( dispUnits ): return new AxisDispUnitsContext( *this, mrModel.mxDispUnits.create() ); diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index a98e1b51223e..9f2cc0f715dc 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -213,6 +213,7 @@ void AxisConverter::convertFromModel( aScaleData.AxisType = (bDateAxis && !mrModel.mbAuto) ? cssc2::AxisType::DATE : cssc2::AxisType::CATEGORY; aScaleData.AutoDateAxis = mrModel.mbAuto; aScaleData.Categories = rTypeGroups.front()->createCategorySequence(); + aScaleData.ShiftedCategoryPosition = pCrossingAxis->mnCrossBetween == XML_between; } else { diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index b09e9e879b9d..6659990cca21 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -36,7 +36,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : mnAxisId( -1 ), mnAxisPos( XML_TOKEN_INVALID ), mnCrossAxisId( -1 ), - mnCrossBetween( XML_between ), + mnCrossBetween( -1 ), mnCrossMode( XML_autoZero ), mnLabelAlign( XML_ctr ), mnLabelOffset( 100 ), |