summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2019-09-27 14:29:49 +0200
committerLászló Németh <nemeth@numbertext.org>2019-10-01 11:19:18 +0200
commit6027ec08fd5df2e09e34ff61b3777ad2cc8304b3 (patch)
tree81f20e234b0aa95e7afa1895f79a12768d5250b5 /chart2
parent78c6b79f2a05eb92f41037fd20c6579a0a644c47 (diff)
tdf#127777 OOXML chart export: fix X axis position setting "CrossBetween"
Export ShiftedCategoryPosition value into the CrossBetween OOXML tag. Change-Id: I3d8b298ed47c5326ee4faf0e8663c8c79d5a1d86 Reviewed-on: https://gerrit.libreoffice.org/79502 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx11
-rw-r--r--chart2/qa/extras/data/xlsx/tdf127777.xlsxbin0 -> 14421 bytes
2 files changed, 11 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index e1c7a4403afe..2589428831bc 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -120,6 +120,7 @@ public:
void testSetSeriesToSecondaryAxisXLSX();
void testCombinedChartSecondaryAxisXLSX();
void testCombinedChartSecondaryAxisODS();
+ void testCrossBetweenXLSX();
void testAxisTitleRotationXLSX();
void testAxisCrossBetweenXSLX();
void testPieChartDataPointExplosionXLSX();
@@ -223,6 +224,7 @@ public:
CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX);
CPPUNIT_TEST(testCombinedChartSecondaryAxisXLSX);
CPPUNIT_TEST(testCombinedChartSecondaryAxisODS);
+ CPPUNIT_TEST(testCrossBetweenXLSX);
CPPUNIT_TEST(testAxisTitleRotationXLSX);
CPPUNIT_TEST(testAxisCrossBetweenXSLX);
CPPUNIT_TEST(testPieChartDataPointExplosionXLSX);
@@ -1901,6 +1903,15 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:crosses", 0);
}
+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");
+}
+
void Chart2ExportTest::testAxisTitleRotationXLSX()
{
load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
diff --git a/chart2/qa/extras/data/xlsx/tdf127777.xlsx b/chart2/qa/extras/data/xlsx/tdf127777.xlsx
new file mode 100644
index 000000000000..c04de30fc8e2
--- /dev/null
+++ b/chart2/qa/extras/data/xlsx/tdf127777.xlsx
Binary files differ