chart2/source/view/main/SeriesPlotterContainer.cxx | 6 ++++++ chart2/source/view/main/SeriesPlotterContainer.hxx | 1 + 2 files changed, 7 insertions(+)
New commits: commit 073df6cd47f14f8401c158336b8440187008a9e6 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Sat Aug 13 23:29:01 2022 +0200 Commit: Tomaž Vajngerl <qui...@gmail.com> CommitDate: Thu Aug 25 07:28:50 2022 +0200 chart2: for a data table we need to force shift category position To be able to show the data table correctly we need to always show the categories "between tick marks" as otherwise the table columns wouldn't align correctly. This forces that the shift position is always enabled. Change-Id: Ia6a627931fcaba64f0f974faf1d8763405ad410d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138337 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> (cherry picked from commit d50bfb406900ddea3a4b2e0c59e0b983798780d4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138784 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/chart2/source/view/main/SeriesPlotterContainer.cxx b/chart2/source/view/main/SeriesPlotterContainer.cxx index b72d2f1bba42..ca1044d11046 100644 --- a/chart2/source/view/main/SeriesPlotterContainer.cxx +++ b/chart2/source/view/main/SeriesPlotterContainer.cxx @@ -167,6 +167,9 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart DBG_UNHANDLED_EXCEPTION("chart2"); } + if (xDiagram->getDataTable().is()) + m_bForceShiftPosition = true; + //prepare for autoscaling and shape creation // - create plotter for charttypes (for each first scale group at each plotter, as they are independent) // - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling) @@ -354,6 +357,9 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart bool SeriesPlotterContainer::isCategoryPositionShifted(const chart2::ScaleData& rSourceScale, bool bHasComplexCategories) { + if (m_bForceShiftPosition) + return true; + if (rSourceScale.AxisType == AxisType::CATEGORY) return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition || m_bChartTypeUsesShiftedCategoryPositionPerDefault; diff --git a/chart2/source/view/main/SeriesPlotterContainer.hxx b/chart2/source/view/main/SeriesPlotterContainer.hxx index ccecac059027..64ab89583aee 100644 --- a/chart2/source/view/main/SeriesPlotterContainer.hxx +++ b/chart2/source/view/main/SeriesPlotterContainer.hxx @@ -156,6 +156,7 @@ private: sal_Int32 m_nMaxAxisIndex; bool m_bChartTypeUsesShiftedCategoryPositionPerDefault; + bool m_bForceShiftPosition = false; sal_Int32 m_nDefaultDateNumberFormat; };