[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/source

[Balazs Varga (via logerrit)]

 chart2/source/model/template/ChartTypeTemplate.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c506720874cedc4999d0c0e4d680914a3100b832
Author:     Balazs Varga <balazs.varga991 at gmail.com>
AuthorDate: Wed Nov 13 16:14:31 2019 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Tue Nov 19 07:51:39 2019 +0100

    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 at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 071007d83d9d29fa7879b71b0e7b396da70963a5)
    Reviewed-on: https://gerrit.libreoffice.org/83097
    Reviewed-by: Balazs Varga <balazs.varga991 at gmail.com>

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) )