[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - chart2/qa oox/source

[Libreoffice Gerrit user]

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

New commits:
commit dcc385e559aea744cecaca96d8b0d17a788381aa
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Jun 28 21:21:29 2018 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 2 11:33:24 2018 +0200

    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/58468
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index f7427b76e9b1..81dfa2551a76 100755
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -1595,6 +1595,7 @@ void Chart2ExportTest::testCustomDataLabel()
     load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
     xmlDocPtr pXmlDoc = parseExport("ppt/charts/chart", "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 ab6049702cde..bd33471c9dad 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3144,10 +3144,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);