Kaydet (Commit) ef2a8d3c authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Andras Timar

tdf#93041: Resolve clashing SID_OFFER_IMPORT vs. SID_ATTR_CHAR_BACK_COLOR

...introduced with c1b9d61b "tdf#88276: Add slot
and handlers for toolbar|sidebar buttons"

Change-Id: Ic63a7766b7f0ccae9144a0ef276e2df63fc22f2e
(cherry picked from commit 4275056a)
Reviewed-on: https://gerrit.libreoffice.org/17508Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 59db7d68
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 ) #define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 )
#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 ) #define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 )
#define SID_ATTR_CHAR_GRABBAG ( SID_SVX_START + 1142 ) #define SID_ATTR_CHAR_GRABBAG ( SID_SVX_START + 1142 )
#define SID_ATTR_CHAR_BACK_COLOR ( SID_SVX_START + 1143 ) #define SID_ATTR_CHAR_BACK_COLOR ( SID_SVX_START + 1153 )
// these ID didn't exist prior to the svx split, add new ids here // these ID didn't exist prior to the svx split, add new ids here
#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) #define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
......
...@@ -1010,6 +1010,8 @@ ...@@ -1010,6 +1010,8 @@
#define SID_EDIT_POSTIT ( SID_SVX_START + 1148 ) #define SID_EDIT_POSTIT ( SID_SVX_START + 1148 )
// 1153 is used by editeng (SID_ATTR_CHAR_BACK_COLOR)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (SID_EDIT_POSTIT + 1) #define SID_SVX_FIRSTFREE (SID_EDIT_POSTIT + 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment