From e701732725dd641741f39020d7dc965bc4db765d Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Tue, 17 Aug 2021 14:28:48 +0200 Subject: tdf#142351 chart ooxml import: fix category axis cross position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set PROP_CrossoverPosition value regardless of the mrModel.mbAuto value, which is a different thing. This element specifies that this axis is a date or text axis based on the data that is used for the axis labels, not a specific choice. Change-Id: Ifa291aac2f4bb3981d968de3489b23f1af485104 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120592 Tested-by: Jenkins Tested-by: László Németh Reviewed-by: László Németh --- chart2/qa/extras/chart2export.cxx | 17 ++++++++++++++--- chart2/qa/extras/data/xlsx/tdf142351.xlsx | Bin 0 -> 15077 bytes 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 chart2/qa/extras/data/xlsx/tdf142351.xlsx (limited to 'chart2') diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 89dcdeb529fd..608905e59328 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -531,10 +531,21 @@ void Chart2ExportTest::testBarChart() void Chart2ExportTest::testCrosses() { - load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + // test crosses val="autoZero" with DOCX + { + load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx"); + xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero"); + } + // tdf#142351: test crossesAt val="-50" with XLSX + { + load(u"/chart2/qa/extras/data/xlsx/", "tdf142351.xlsx"); + xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt", "val", "-50"); + } } void Chart2ExportTest::testScatterChartTextXValues() diff --git a/chart2/qa/extras/data/xlsx/tdf142351.xlsx b/chart2/qa/extras/data/xlsx/tdf142351.xlsx new file mode 100644 index 000000000000..0414bb3f1625 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf142351.xlsx differ -- cgit