Kaydet (Commit) ae2fd281 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Szymon Kłos

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: 's avatarJustin Luth <justin_luth@sil.org>
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
üst 4087130d
......@@ -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());
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment