diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-01-26 20:59:21 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-01-28 10:00:40 +0100 |
| commit | 296f3f8e4a5337b82fc72845662b5d5749acdf99 (patch) | |
| tree | d8019328259bcada628a32cf3786e690fe222870 /chart2 | |
| parent | c8a27f91dad1d84da76f0862954956570b56a602 (diff) | |
tdf#108107 OOXML chart: fix format of custom data point labels
Do not overwrite the property of moved data point labels
with default values, but use the data series properties for
these labels.
Change-Id: Id27fa1c2d8286584b2b87b7eb7a64fd9b416dc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87463
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 12 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/tdf108107.xlsx | bin | 0 -> 14277 bytes |
2 files changed, 12 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 96278053d59f..ea19e9d2ad0a 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -86,6 +86,7 @@ public: void testDataLabelAreaChartDOCX(); void testDataLabelDefaultLineChartDOCX(); void testIndividualDataLabelProps(); + void testTdf108107(); void testChartTitlePropertiesColorFillDOCX(); void testChartTitlePropertiesGradientFillDOCX(); void testChartTitlePropertiesBitmapFillDOCX(); @@ -200,6 +201,7 @@ public: CPPUNIT_TEST(testDataLabelAreaChartDOCX); CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX); CPPUNIT_TEST(testIndividualDataLabelProps); + CPPUNIT_TEST(testTdf108107); CPPUNIT_TEST(testChartTitlePropertiesColorFillDOCX); CPPUNIT_TEST(testChartTitlePropertiesGradientFillDOCX); CPPUNIT_TEST(testChartTitlePropertiesBitmapFillDOCX); @@ -1208,6 +1210,16 @@ void Chart2ExportTest::testIndividualDataLabelProps() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:latin", "typeface", "Times New Roman"); } +void Chart2ExportTest::testTdf108107() +{ + load("/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "sz", "2000"); +} + void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX() { load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx"); diff --git a/chart2/qa/extras/data/xlsx/tdf108107.xlsx b/chart2/qa/extras/data/xlsx/tdf108107.xlsx Binary files differnew file mode 100644 index 000000000000..3f86326fa28e --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf108107.xlsx |