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

[Libreoffice Gerrit user]

 oox/source/export/chartexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e441a35799738180d64f47508ef3f7d3c8d3d35
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Mon Jan 21 17:31:36 2019 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jan 21 21:11:35 2019 +0100

    tdf#122031 Change element order for OOXML compatibility.
    
    Change-Id: I8cca2db6157996dd25afa4c95e769725188fdfb9
    Signed-off-by: Gülşah Köse <gulsah.kose at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/66686
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins
    (cherry picked from commit 1e38d5b976dacd8b42b8330b4b9635a058ffe20b)
    Reviewed-on: https://gerrit.libreoffice.org/66702
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 2f4b55fcd2d8..37c267dcbcd3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3168,6 +3168,7 @@ void ChartExport::exportDataLabels(
             continue;
 
         pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND);
+        pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND);
 
         if (GetProperty(xLabelPropSet, "NumberFormat") || GetProperty(xLabelPropSet, "PercentageNumberFormat"))
         {
@@ -3182,7 +3183,6 @@ void ChartExport::exportDataLabels(
         }
 
         // Individual label property that overwrites the baseline.
-        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));