summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2020-04-17 14:12:00 +0200
committerLászló Németh <nemeth@numbertext.org>2020-05-05 09:17:22 +0200
commit778a81c114187b193140ebe816eec0805f40b6ab (patch)
tree05df5efb083410743f6875efe81428c4335c69cd /chart2
parent62ba3248f654febe55fdf422163fff76552e9c32 (diff)
tdf#132486 Chart: fix OOXML export of ShiftedCategoryPosition
Regression from commit 75156c6fd73dc202df541306e1636727d51d6fc3 (tdf#132076 Chart OOXML: fix lost date format of X axis) Change-Id: I4bb62959775b0b6ed11e1f7e5473c3b9805f4e29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92420 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx18
1 files changed, 13 insertions, 5 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 200704e90a8d..91fad970586e 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2068,11 +2068,19 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
void Chart2ExportTest::testCrossBetweenXLSX()
{
- // Original file was created with MS Office
- load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
- xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
- CPPUNIT_ASSERT(pXmlDoc);
- assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ // Original files were created with MS Office
+ {
+ load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ }
+ {
+ load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ }
}
void Chart2ExportTest::testCrossBetweenWithDeletedAxis()