summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2020-09-18 13:20:30 +0300
committerGülşah Köse <gulsah.kose@collabora.com>2020-09-22 10:35:16 +0200
commit39a479b63abf2917abab8e1e431a9be1fc163b8e (patch)
tree86be8d5d87f68a96ea71d8a0922e65682f5de158 /chart2
parentfc0493e59be95f101d26144e622998c38ac3fd45 (diff)
tdf#136247 OOXML export data label background color.
Change-Id: Ie3e00e8195239e6570bfe76c2451bae11c209145 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102999 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit a11bb74d4f464e9639ddb5b8d87dc4770663fea8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103045 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx17
-rw-r--r--chart2/qa/extras/data/xlsx/data_labels_fill_color.xlsxbin0 -> 11256 bytes
2 files changed, 17 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index b1441268b31a..449ad70c0cb1 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -101,6 +101,7 @@ public:
void testAxisNumberFormatXLSX();
void testDataPointLabelNumberFormatXLSX();
void testDataLabelDefaultValuesXLSX();
+ void testDataLabelFillColor();
void testTitleOverlayXLSX();
void testInvertIfNegativeXLSX();
void testBubble3DXLSX();
@@ -216,6 +217,7 @@ public:
CPPUNIT_TEST(testAxisNumberFormatXLSX);
CPPUNIT_TEST(testDataPointLabelNumberFormatXLSX);
CPPUNIT_TEST(testDataLabelDefaultValuesXLSX);
+ CPPUNIT_TEST(testDataLabelFillColor);
CPPUNIT_TEST(testTitleOverlayXLSX);
CPPUNIT_TEST(testInvertIfNegativeXLSX);
CPPUNIT_TEST(testBubble3DXLSX);
@@ -1633,6 +1635,21 @@ void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos", "val", "outEnd");
}
+void Chart2ExportTest::testDataLabelFillColor()
+{
+ load("/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
+ Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
+ Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
+ Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
+ uno::Any aAny = xPropSet->getPropertyValue("LabelFillColor");
+ sal_Int32 nLabelFillColor;
+ CPPUNIT_ASSERT(aAny >>= nLabelFillColor);
+
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:spPr/a:solidFill/a:srgbClr", "val", "F79646");
+}
+
void Chart2ExportTest::testTitleOverlayXLSX()
{
load("/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
diff --git a/chart2/qa/extras/data/xlsx/data_labels_fill_color.xlsx b/chart2/qa/extras/data/xlsx/data_labels_fill_color.xlsx
new file mode 100644
index 000000000000..1a55f5b86836
--- /dev/null
+++ b/chart2/qa/extras/data/xlsx/data_labels_fill_color.xlsx
Binary files differ