diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-09-18 15:45:17 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-09-22 15:37:58 +0200 |
| commit | f8db854ce9d7df501ef1a466c81f92c1ac60ab91 (patch) | |
| tree | 0f57bd88325a8f34b5f506a66c50fff0a38816f4 | |
| parent | 716f308bcaa961109027bf26a44fd4dfc4b24702 (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>
| -rw-r--r-- | include/oox/export/chartexport.hxx | 2 | ||||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index ac22a18b8957..88e118fe7e60 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -179,7 +179,6 @@ private: void exportSeriesValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xValueSeq, sal_Int32 nValueType = XML_val ); void exportShapeProps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); - void exportTextProps(const css::uno::Reference< css::beans::XPropertySet >& xPropSet); void exportDataPoints( const css::uno::Reference< css::beans::XPropertySet >& xSeriesProperties, sal_Int32 nSeriesLength, sal_Int32 eChartType ); @@ -224,6 +223,7 @@ public: const css::uno::Reference< css::frame::XModel >& getModel() const { return mxChartModel; } void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount ); + void exportTextProps(const css::uno::Reference< css::beans::XPropertySet >& xPropSet); void ExportContent(); void InitRangeSegmentationProperties( 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); |