diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-06-28 21:21:29 +0300 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2018-06-29 10:50:53 +0200 |
| commit | ae2fd281e046b2199ef44777b84518cd3abb2952 (patch) | |
| tree | 7d41b7d16d6fb235dda31d089e3d0a215d86c3bf | |
| parent | 4087130d0531a31456310bfe5c41a028dacd5a4d (diff) | |
tdf#115945 oox export: data label writeRunProperties
DataLabel font was always returning to the default - black.
Change-Id: I6c72a8daa699394b36f69fc54e0ba042f0255c18
Reviewed-on: https://gerrit.libreoffice.org/56616
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 1 | ||||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 8ed59e43cf84..2a0d7e5df1c4 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -1580,6 +1580,7 @@ void Chart2ExportTest::testCustomDataLabel() load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx"); xmlDocPtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS PowerPoint 2007 XML"); CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "404040"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index c6f30fb5600a..5af781a8ae26 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -3178,10 +3178,12 @@ void ChartExport::exportDataLabels( // Individual label property that overwrites the baseline. pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND); pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND); + exportTextProps( xPropSet ); writeLabelProperties(pFS, this, xLabelPropSet, aParam); pFS->endElement(FSNS(XML_c, XML_dLbl)); } + exportTextProps( xPropSet ); // Baseline label properties for all labels. writeLabelProperties(pFS, this, xPropSet, aParam); |