sc/inc/sc.hrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 01a59744e4ebed4e10bea308623afdb6223162da Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Aug 19 10:22:12 2022 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Fri Aug 19 14:46:43 2022 +0200 tdf#150336 add a static_assert to catch that happening again Change-Id: I96e0ef15aec28250c1e408d16e76cd4443b88ed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138515 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 5dbd9a7bb934fbe182a3fa2423f506563bd1ef8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138535 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 1f580d687e55..39892c4fb6ec 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -462,7 +462,11 @@ class SvxZoomSliderItem; #define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) #define SID_PREVIEW_MARGIN (SID_PREVIEW_START+8) #define SID_PREVIEW_SCALINGFACTOR TypedWhichId<SvxZoomSliderItem>(SID_PREVIEW_START+9) -#define SID_PREVIEW_END (SID_PREVIEW_START+20) +#define SID_PREVIEW_END (SID_PREVIEW_START+10) + +// with SID_KEYFUNC_START defined in include/sfx2/sfxsids.hrc there is a risk of +// adding entries that cause an overlap here +static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc slots ids trampling info keyfunc slot range"); //from sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) // from SID_KEYFUNC_START + 0 to SID_KEYFUNC_START + 13 are defined in include/sfx2/sfxsids.hrc