diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-07-19 18:18:00 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-09-09 07:41:51 +0000 |
commit | 9ed1dd01be8afa0961e388a79e9ff4c1235820c2 (patch) | |
tree | 366cad6bae91e791be462e4c03f499ab0ba3e2f2 /chart2/source/inc/chartview | |
parent | 79bc956e7f44b762bfd6560e5a9c9812fa3dcf4d (diff) |
tdf#90839: support for wrapped text in data labels and for centered data value
Now in a pie chart the text of a label can be wrapped, the wrapping is
automatic and the maximum text width is fixed to almost half the pie
radius. This feature is used to import correctly the relative text
wrapping property provided by MSO.
Moreover the data value and percent value of a label are now centered
horizontally, respect with the label text.
Conflicts:
chart2/qa/extras/xshape/chart2xshape.cxx
Change-Id: Ie10d6184365436f763cd9693a5bbefcfa9b3862b
Reviewed-on: https://gerrit.libreoffice.org/17193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2/source/inc/chartview')
-rw-r--r-- | chart2/source/inc/chartview/ChartSfxItemIds.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 7481cc88169a..3bce731ebdce 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -29,12 +29,13 @@ #define SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1) #define SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2) #define SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3) -#define SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 4) -#define SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 5) -#define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 6) -#define SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 7) //percentage values should not be offered -#define SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_DATADESCR_START + 8) -#define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 9) +#define SCHATTR_DATADESCR_WRAP_TEXT (SCHATTR_DATADESCR_START + 4) +#define SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 5) +#define SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 6) +#define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 7) +#define SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 8) //percentage values should not be offered +#define SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_DATADESCR_START + 9) +#define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 10) #define SCHATTR_DATADESCR_END SCHATTR_PERCENT_NUMBERFORMAT_SOURCE //legend |