diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-08-29 13:44:37 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-02 09:41:32 +0200 |
| commit | 0d2340998415fb4b2f794054c62ef61c83e32155 (patch) | |
| tree | 8061d63de276c27cc75f961742033b31105beb8d /chart2/source/controller/chartapiwrapper | |
| parent | 7541fac2c0d5341f4d362779594ae236f05ff9a6 (diff) | |
tdf#136061 Chart ODF/OOXML: fix missing custom labels
by UNO extensions ShowCustomLabel in DataPointLabel.idl and
CUSTOM in ChartDataCaption.idl, fixing OOXML/ODF import/export.
We should display custom data label even if DataPointLabel is
disabled (e.g. category name and/or value fields are not displayed).
Note: import of the embedded chart of the DOCX unit test
document uses also ODF format in the background, testing
also the extension of the native file format.
Change-Id: I73e21f1e69fddec9f3b4163c46b6582cd1c74b5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101640
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index f55540f67db8..c786c1b3913c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -71,7 +71,7 @@ sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) { - chart2::DataPointLabel aLabel(false,false,false,false); + chart2::DataPointLabel aLabel(false,false,false,false,false); if( nCaption & css::chart::ChartDataCaption::VALUE ) aLabel.ShowNumber = true; @@ -81,6 +81,8 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) aLabel.ShowCategoryName = true; if( nCaption & css::chart::ChartDataCaption::SYMBOL ) aLabel.ShowLegendSymbol = true; + if( nCaption & css::chart::ChartDataCaption::CUSTOM ) + aLabel.ShowCustomLabel = true; return aLabel; } |