summaryrefslogtreecommitdiff
path: root/chart2/inc
diff options
context:
space:
mode:
authorKurt Nordback <kurt.nordback@protonmail.com>2024-06-11 10:04:37 -0600
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2024-07-29 13:12:31 +0200
commit37bca7e571b1356b29addeb631066350e03e64ea (patch)
treeff9ee9b5a20e46d58480f6bd34eecfec73478de5 /chart2/inc
parentca21cc985d57fffe7c834159b17c095206304994 (diff)
tdf#161090 - Spec how many / which values are in remainder of-Pie chart
This commit moves bar-of-pie and pie-of-pie chart types into a separate line in the chart type selection UI from 'plain' pie chart types. This allows for separate UI controls, including a spin button added in this commit for of-pie types to specify the number of entries to be included in the composite wedge and broken out in the right-hand subchart. Per discussion in this and related bugs, this may not be the long-term best approach for specifying which entries go into the composite, and it still only allows for the last entries in the composite. But it is a step towards allowing greater control. I've also changed the default number in the composite from 3 to 2, to better match MSO. I/O of the 'number in the composite wedge' parameter is not included in this commit. Implementing that for ODF and OOXML perhaps should be a separate bug or bugs. Change-Id: If4afc1417ea94c15e86a9a4dfe967a6f8ecb7ca8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168690 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'chart2/inc')
-rw-r--r--chart2/inc/bitmaps.hlst1
-rw-r--r--chart2/inc/strings.hrc1
2 files changed, 2 insertions, 0 deletions
diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst
index d5c7b75ff4c1..f0eabe5d53eb 100644
--- a/chart2/inc/bitmaps.hlst
+++ b/chart2/inc/bitmaps.hlst
@@ -13,6 +13,7 @@ inline constexpr OUString BMP_TYPE_COLUMN = u"chart2/res/typecolumn_16.png"_ustr
inline constexpr OUString BMP_TYPE_BAR = u"chart2/res/typebar_16.png"_ustr;
inline constexpr OUString BMP_TYPE_HISTOGRAM = u"chart2/res/typehistogram_16.png"_ustr;
inline constexpr OUString BMP_TYPE_PIE = u"chart2/res/typepie_16.png"_ustr;
+inline constexpr OUString BMP_TYPE_OFPIE = u"chart2/res/typeofpie_16.png"_ustr;
inline constexpr OUString BMP_TYPE_LINE = u"chart2/res/typepointline_16.png"_ustr;
inline constexpr OUString BMP_TYPE_XY = u"chart2/res/typexy_16.png"_ustr;
inline constexpr OUString BMP_TYPE_AREA = u"chart2/res/typearea_16.png"_ustr;
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index f671a404a6d5..c6292baa97f5 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -162,6 +162,7 @@
#define STR_HISTOGRAM NC_("STR_HISTOGRAM", "Histogram Chart")
#define STR_TYPE_AREA NC_("STR_TYPE_AREA", "Area")
#define STR_TYPE_PIE NC_("STR_TYPE_PIE", "Pie")
+#define STR_TYPE_OFPIE NC_("STR_TYPE_PIE", "Of-Pie")
#define STR_PIE_EXPLODED NC_("STR_PIE_EXPLODED", "Exploded Pie Chart")
#define STR_BAR_OF_PIE NC_("STR_BAR_OF_PIE", "Bar-of-pie Chart")
#define STR_PIE_OF_PIE NC_("STR_PIE_OF_PIE", "Pie-of-pie Chart")