diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-02-14 16:30:43 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2019-03-05 08:52:37 +0100 |
| commit | 66b9f180c865d0ed57a297fe439a068f513b0fc6 (patch) | |
| tree | d1b208546cd9ca5cec38871d9ab4ddbe23a5760c /chart2 | |
| parent | 5ccbdb6551931a18bb60a961455f93ac918cc7e8 (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>
(cherry picked from commit b89f239aa9d3d4660380bbd0c893aecde0986032)
Reviewed-on: https://gerrit.libreoffice.org/67950
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 19 | ||||
| -rwxr-xr-x | chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx | bin | 0 -> 14559 bytes |
2 files changed, 19 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 88d58bd7c683..839ef8c71752 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -41,6 +41,7 @@ protected: public: Chart2ExportTest() : ChartTest() {} void testErrorBarXLSX(); + void testErrorBarPropXLSX(); void testTrendline(); void testTrendlineOOXML(); void testTrendlineXLS(); @@ -128,6 +129,7 @@ public: CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); + CPPUNIT_TEST(testErrorBarPropXLSX); CPPUNIT_TEST(testTrendline); CPPUNIT_TEST(testTrendlineOOXML); CPPUNIT_TEST(testTrendlineXLS); @@ -490,6 +492,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 Binary files differnew file mode 100755 index 000000000000..ac9dde9b79b6 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx |