summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2019-02-14 16:30:43 +0100
committerLászló Németh <nemeth@numbertext.org>2019-02-15 07:30:09 +0100
commitb89f239aa9d3d4660380bbd0c893aecde0986032 (patch)
tree4e23baecb86ea7da798cd789715ef09e333ad085 /chart2
parent153c40adacbe1b6b4e8c205f02afabf22fe3c0bf (diff)
tdf#97575 Chart OOXML: Export ShapeProps of Error Bars
Export the shapeProps (fillstyle, linestyle, linewidth, linecolor etc.) of the Error Bars to OOXML. Change-Id: Iff74fa463fdd0fb6ed95e4d1bf0d3e906349860c Reviewed-on: https://gerrit.libreoffice.org/67825 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx19
-rwxr-xr-xchart2/qa/extras/data/xlsx/testErrorBarProp.xlsxbin0 -> 14559 bytes
2 files changed, 19 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index b16e773ab776..8671a4771e21 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -40,6 +40,7 @@ protected:
public:
Chart2ExportTest() : ChartTest() {}
void testErrorBarXLSX();
+ void testErrorBarPropXLSX();
void testTrendline();
void testTrendlineOOXML();
void testTrendlineXLS();
@@ -130,6 +131,7 @@ public:
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
+ CPPUNIT_TEST(testErrorBarPropXLSX);
CPPUNIT_TEST(testTrendline);
CPPUNIT_TEST(testTrendlineOOXML);
CPPUNIT_TEST(testTrendlineXLS);
@@ -495,6 +497,23 @@ void Chart2ExportTest::testErrorBarXLSX()
}
}
+void Chart2ExportTest::testErrorBarPropXLSX()
+{
+ load("/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ // test y error bars property
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir", "val", "y");
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln", "w", "12600");
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "ff0000");
+
+ // test x error bars property
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", "val", "x");
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln", "w", "9360");
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "595959");
+}
+
// This method tests the preservation of properties for trendlines / regression curves
// in an export -> import cycle using different file formats - ODS, XLS and XLSX.
void Chart2ExportTest::testTrendline()
diff --git a/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx b/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx
new file mode 100755
index 000000000000..ac9dde9b79b6
--- /dev/null
+++ b/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx
Binary files differ