From f7421e4df0a37ec66d4d4edcbee6ab0613ba1c60 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Wed, 15 Jul 2026 21:30:37 +0500
Subject: [PATCH] tdf#159450 Keep axis title centered on plot area with data
 table

When a chart shows a data table, it is drawn as a strip at the bottom of
the diagram, so the plot-area-plus-axes rectangle grows to include it. The
vertical axis title was centered on that rectangle and thus ended up shifted
downwards compared to MS Office, which centers it on the plot area alone.

Center the left- and right-aligned axis titles on the plot area rectangle
(which already excludes the data table) instead of on the plot area plus
axes, so the title stays centered on the axis.

Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: If21ba0938cea16abc382e686b9c4e2b84caf2dca
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/6978
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
(cherry picked from commit 48953636f24d522426d5f5e4ed9f0fc5ec6f30f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208241
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
---
 chart2/qa/extras/chart2import2.cxx        |  26 ++++++++++++++++++++++
 chart2/qa/extras/data/xlsx/tdf159450.xlsx | Bin 0 -> 13857 bytes
 chart2/source/view/main/ChartView.cxx     |  23 ++++++++++++-------
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 chart2/qa/extras/data/xlsx/tdf159450.xlsx

diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx
index 7fba95030162..1e83d03d7c56 100644
--- a/chart2/qa/extras/chart2import2.cxx
+++ b/chart2/qa/extras/chart2import2.cxx
@@ -883,6 +883,32 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testChartDataTableWithMultipleLegendEntr
     CPPUNIT_ASSERT(xDataTableShape.is());
 }
 
+CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf159450AxisTitleWithDataTable)
+{
+    // The chart has a vertical axis title and a data table below the plot area.
+    // The axis title must stay centered on the plot area, not on the whole
+    // diagram including the data table below it (which used to shift it down).
+    loadFromFile(u"xlsx/tdf159450.xlsx");
+    auto xDrawPage
+        = getChartDocFromSheet(0).queryThrow<drawing::XDrawPageSupplier>()->getDrawPage();
+    auto xShapes = xDrawPage->getByIndex(0).queryThrow<drawing::XShapes>();
+
+    // The chart has a data table, drawn below the plot area.
+    CPPUNIT_ASSERT(getShapeByName(xShapes, u"CID/D=0:DataTable="_ustr).is());
+    Reference<drawing::XShape> xPlotArea = getShapeByName(xShapes, u"PlotAreaExcludingAxes"_ustr);
+    CPPUNIT_ASSERT(xPlotArea.is());
+    Reference<drawing::XShape> xAxisTitle
+        = getShapeByName(xShapes, u"CID/D=0:CS=0:Axis=1,0:Title="_ustr);
+    CPPUNIT_ASSERT(xAxisTitle.is());
+
+    // The vertical axis title is centered on the plot area. Before the fix it was
+    // centered on the plot area plus the data table below it, so its center sat
+    // about half the data table height lower.
+    sal_Int32 nTitleCenterY = xAxisTitle->getPosition().Y + xAxisTitle->getSize().Height / 2;
+    sal_Int32 nPlotCenterY = xPlotArea->getPosition().Y + xPlotArea->getSize().Height / 2;
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(nPlotCenterY, nTitleCenterY, 20);
+}
+
 namespace
 {
 void lcl_assertAngles(const Reference<chart2::XAxis>& rAxis, const double& rExpectedLabelAngle,
diff --git a/chart2/qa/extras/data/xlsx/tdf159450.xlsx b/chart2/qa/extras/data/xlsx/tdf159450.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..011bc9778d47839a9bee6b12ddafbaf1542a4399
GIT binary patch
literal 13857
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
CSs@$%

literal 0
HcmV?d00001

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 28e4333da5b9..9f6739f2ed11 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -993,7 +993,8 @@ bool getAvailablePosAndSizeForDiagram(
 enum class TitleAlignment { ALIGN_LEFT, ALIGN_TOP, ALIGN_RIGHT, ALIGN_BOTTOM, ALIGN_Z };
 
 void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
-                               , awt::Rectangle const & rDiagramPlusAxesRect, const awt::Size & rPageSize )
+                               , awt::Rectangle const & rDiagramPlusAxesRect, sal_Int32 nDiagramVerticalCenter
+                               , const awt::Size & rPageSize )
 {
     if(!pVTitle)
         return;
@@ -1013,12 +1014,14 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
                                     , rDiagramPlusAxesRect.Y + rDiagramPlusAxesRect.Height + aTitleSize.Height/2  + nYDistance );
         break;
     case TitleAlignment::ALIGN_LEFT:
+        // Center on the plot area (the axis), not on the plot area plus axes,
+        // so a data table drawn below the plot area does not shift the title down.
         aNewPosition = awt::Point( rDiagramPlusAxesRect.X - aTitleSize.Width/2 - nXDistance
-                                    , rDiagramPlusAxesRect.Y + rDiagramPlusAxesRect.Height/2 );
+                                    , nDiagramVerticalCenter );
         break;
     case TitleAlignment::ALIGN_RIGHT:
         aNewPosition = awt::Point( rDiagramPlusAxesRect.X + rDiagramPlusAxesRect.Width + aTitleSize.Width/2 + nXDistance
-                                    , rDiagramPlusAxesRect.Y + rDiagramPlusAxesRect.Height/2 );
+                                    , nDiagramVerticalCenter );
         break;
     case TitleAlignment::ALIGN_Z:
         aNewPosition = awt::Point( rDiagramPlusAxesRect.X + rDiagramPlusAxesRect.Width + aTitleSize.Width/2 + nXDistance
@@ -1986,16 +1989,20 @@ void ChartView::createShapes2D( const awt::Size& rPageSize )
 
         //correct axis title position
         awt::Rectangle aDiagramPlusAxesRect( aUsedOuterRect );
+        // The vertical (left/right) axis titles are centered on the plot area,
+        // which excludes a data table drawn below it.
+        sal_Int32 nDiagramVerticalCenter = m_aResultingDiagramRectangleExcludingAxes.Y
+            + m_aResultingDiagramRectangleExcludingAxes.Height / 2;
         if (aParam.mbAutoPosTitleX)
-            changePositionOfAxisTitle(aParam.mpVTitleX.get(), TitleAlignment::ALIGN_BOTTOM, aDiagramPlusAxesRect, rPageSize);
+            changePositionOfAxisTitle(aParam.mpVTitleX.get(), TitleAlignment::ALIGN_BOTTOM, aDiagramPlusAxesRect, nDiagramVerticalCenter, rPageSize);
         if (aParam.mbAutoPosTitleY)
-            changePositionOfAxisTitle(aParam.mpVTitleY.get(), TitleAlignment::ALIGN_LEFT, aDiagramPlusAxesRect, rPageSize);
+            changePositionOfAxisTitle(aParam.mpVTitleY.get(), TitleAlignment::ALIGN_LEFT, aDiagramPlusAxesRect, nDiagramVerticalCenter, rPageSize);
         if (aParam.mbAutoPosTitleZ)
-            changePositionOfAxisTitle(aParam.mpVTitleZ.get(), TitleAlignment::ALIGN_Z, aDiagramPlusAxesRect, rPageSize);
+            changePositionOfAxisTitle(aParam.mpVTitleZ.get(), TitleAlignment::ALIGN_Z, aDiagramPlusAxesRect, nDiagramVerticalCenter, rPageSize);
         if (aParam.mbAutoPosSecondTitleX)
-            changePositionOfAxisTitle(aParam.mpVTitleSecondX.get(), bIsVertical? TitleAlignment::ALIGN_RIGHT : TitleAlignment::ALIGN_TOP, aDiagramPlusAxesRect, rPageSize);
+            changePositionOfAxisTitle(aParam.mpVTitleSecondX.get(), bIsVertical? TitleAlignment::ALIGN_RIGHT : TitleAlignment::ALIGN_TOP, aDiagramPlusAxesRect, nDiagramVerticalCenter, rPageSize);
         if (aParam.mbAutoPosSecondTitleY)
-            changePositionOfAxisTitle(aParam.mpVTitleSecondY.get(), bIsVertical? TitleAlignment::ALIGN_TOP : TitleAlignment::ALIGN_RIGHT, aDiagramPlusAxesRect, rPageSize);
+            changePositionOfAxisTitle(aParam.mpVTitleSecondY.get(), bIsVertical? TitleAlignment::ALIGN_TOP : TitleAlignment::ALIGN_RIGHT, aDiagramPlusAxesRect, nDiagramVerticalCenter, rPageSize);
     }
 
     //cleanup: remove all empty group shapes to avoid grey border lines: