summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2020-09-18 15:45:17 +0300
committerGülşah Köse <gulsah.kose@collabora.com>2020-09-22 15:37:58 +0200
commitf8db854ce9d7df501ef1a466c81f92c1ac60ab91 (patch)
tree0f57bd88325a8f34b5f506a66c50fff0a38816f4 /oox
parent716f308bcaa961109027bf26a44fd4dfc4b24702 (diff)
tdf#136247 Change element order of data labels
Reference OOXML (Appendix B.5.1, line 248) Change-Id: Idf5c2546b4ad65c8e78ca03e18ecfa575ef17fe8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103005 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit de59062d95605e5c91d687e3441399ffb05ff2dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103051 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/chartexport.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 4c0ef9d202f3..a95087dbcb89 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3232,6 +3232,8 @@ void writeLabelProperties( const FSHelperPtr& pFS, ChartExport* pChartExport,
pFS->endElement(FSNS(XML_c, XML_spPr));
}
+ pChartExport->exportTextProps(xPropSet);
+
if (aCustomLabelFields.hasElements())
writeCustomLabel(pFS, pChartExport, aCustomLabelFields);
@@ -3382,12 +3384,10 @@ void ChartExport::exportDataLabels(
}
// Individual label property that overwrites the baseline.
- exportTextProps( xLabelPropSet );
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);