diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-11-16 14:44:45 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-11-17 11:10:09 +0100 |
| commit | 4930749294475cc28afd06cd11fdf56a157ad9ce (patch) | |
| tree | aaf87283eb47c7e44cd34361c8f5408d41f50456 /oox | |
| parent | 1724b7a2cb16336b2c6e066504708396b8ecfa32 (diff) | |
tdf#138204 Chart OOXML Import: doesn't show placeholder
for CELLRANGE data label field type. Add CELLRANGE to enum
com::sun::star::chart2::DataPointCustomLabelFieldType, like
we do at CELLREF, while both of them are not implemented, see
commit 790f9abeb1a1167ad5ab84c5fb855b36669c125b
(tdf#114821 import complex data labels in bar chart).
Regression from commit: 0d2340998415fb4b2f794054c62ef61c83e32155
(tdf#136061 Chart ODF/OOXML: fix missing custom labels)
Change-Id: I8e0f4ca9db6e613a190cbda31504a7542fc13a86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105934
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 2 | ||||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 416e6c32e638..2de8ee82d2f9 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -249,6 +249,8 @@ DataPointCustomLabelFieldType lcl_ConvertFieldNameToFieldEnum( const OUString& r return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CATEGORYNAME; else if (rField == "CELLREF") return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLREF; + else if (rField == "CELLRANGE") + return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE; else if (rField == "PERCENTAGE") return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_PERCENTAGE; else diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 5f9a35b41ac5..3ea7a1d7eb7a 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -3397,6 +3397,9 @@ OUString getFieldTypeString( const chart2::DataPointCustomLabelFieldType aType ) case chart2::DataPointCustomLabelFieldType_CELLREF: return "CELLREF"; + case chart2::DataPointCustomLabelFieldType_CELLRANGE: + return "CELLRANGE"; + default: break; } |