sc/inc/sc.hrc | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit f40143cae28e99426414f484929e25d28ec2c9d2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 19 08:57:21 2022 +0100
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Sat Aug 20 21:32:35 2022 +0200
Resolves: tdf#150336 overlapping slot ids
Change-Id: I54fc92d1d7afd61febbbb057868b038864f29ec2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138432
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit d3492e15dce1dc8448c6444a92e3e2f7ec19571c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138566
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 24a6fefa19bf..4c34bb149340 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -306,14 +306,7 @@
#define FID_INS_ROWS_BEFORE (INSERT_MENU_START + 22)
#define FID_INS_COLUMNS_BEFORE (INSERT_MENU_START + 23)
#define FID_DEFINE_CURRENT_NAME (INSERT_MENU_START + 24)
-#define SID_INSERT_SPARKLINE (INSERT_MENU_START + 25)
-#define SID_DELETE_SPARKLINE (INSERT_MENU_START + 26)
-#define SID_EDIT_SPARKLINE_GROUP (INSERT_MENU_START + 27)
-#define SID_DELETE_SPARKLINE_GROUP (INSERT_MENU_START + 28)
-#define SID_GROUP_SPARKLINES (INSERT_MENU_START + 29)
-#define SID_UNGROUP_SPARKLINES (INSERT_MENU_START + 30)
-#define SID_EDIT_SPARKLINE (INSERT_MENU_START + 31)
-#define INSERT_MENU_END (INSERT_MENU_START + 32)
+#define INSERT_MENU_END (INSERT_MENU_START + 25)
#define FORMAT_MENU_START (INSERT_MENU_END)
#define FID_CELL_FORMAT (FORMAT_MENU_START)
@@ -611,6 +604,15 @@
#define SID_SELECT_VISIBLE_ROWS (SID_NEW_SLOTS+107)
#define SID_SELECT_VISIBLE_COLUMNS (SID_NEW_SLOTS+108)
#define SID_CURRENT_FORMULA_RANGE (SID_NEW_SLOTS+109)
+
+#define SID_INSERT_SPARKLINE (SID_NEW_SLOTS+110)
+#define SID_DELETE_SPARKLINE (SID_NEW_SLOTS+111)
+#define SID_EDIT_SPARKLINE_GROUP (SID_NEW_SLOTS+112)
+#define SID_DELETE_SPARKLINE_GROUP (SID_NEW_SLOTS+113)
+#define SID_GROUP_SPARKLINES (SID_NEW_SLOTS+114)
+#define SID_UNGROUP_SPARKLINES (SID_NEW_SLOTS+115)
+#define SID_EDIT_SPARKLINE (SID_NEW_SLOTS+116)
+
// idl parameter
#define SID_SORT_BYROW (SC_PARAM_START)
