diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-11-13 16:14:31 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-11-19 07:51:39 +0100 |
| commit | c506720874cedc4999d0c0e4d680914a3100b832 (patch) | |
| tree | b417d65e0fd731133b0a9de5afe58f029e2f66cb /chart2 | |
| parent | bbfcada38c71ca8f0adf779e9fb66d577683ad71 (diff) | |
tdf#127777 fix "CrossBetween" for not imported combined chart
Set the ShiftedCategoryPosition for true in case of combined chart.
See also commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f 'tdf#127777
OOXML chart export: fix "CrossBetween" for not imported charts
Change-Id: I52fdcdc52e75ac15c85e04c2982b25cc180d7815
Reviewed-on: https://gerrit.libreoffice.org/82617
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 071007d83d9d29fa7879b71b0e7b396da70963a5)
Reviewed-on: https://gerrit.libreoffice.org/83097
Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index c18851796ada..afd9eb0f048a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -626,7 +626,10 @@ void ChartTypeTemplate::adaptScales( Reference< XChartType > xChartType(getChartTypeForNewSeries(Sequence< Reference< XChartType > >())); if( aData.AxisType == AxisType::CATEGORY ) { - aData.ShiftedCategoryPosition = ::chart::ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault(xChartType); + if( !m_aServiceName.endsWith("ColumnWithLine") ) + aData.ShiftedCategoryPosition = ::chart::ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault(xChartType); + else + aData.ShiftedCategoryPosition = true; } bool bSupportsDates = ::chart::ChartTypeHelper::isSupportingDateAxis( xChartType, nDimensionX ); if( aData.AxisType != AxisType::CATEGORY && ( aData.AxisType != AxisType::DATE || !bSupportsDates) ) |