[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - chart2/qa oox/source

[Justin Luth]

 chart2/qa/extras/chart2export.cxx |    1 +
 oox/source/export/chartexport.cxx |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 58284e26fa604edc02b7598cb77a5b272c288320
Author: Justin Luth <justin.luth at collabora.com>
Date:   Thu Jun 28 21:21:29 2018 +0300

    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 at sil.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit ae2fd281e046b2199ef44777b84518cd3abb2952)
    Reviewed-on: https://gerrit.libreoffice.org/56725
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index b77aeda6755b..da15d321a881 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -1583,6 +1583,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 bd91390d5f3c..16ae6a190ea3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3180,10 +3180,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);