summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-04 18:45:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-04 18:45:15 +0200
commit4275056a90eb9e178062276cc104ac2b94db13ca (patch)
tree846db0c176b1a33dc4efdd9ab716da814a078dc9
parentec1a0354050491e84792a30df75d361803b62b1f (diff)
tdf#93041: Resolve clashing SID_OFFER_IMPORT vs. SID_ATTR_CHAR_BACK_COLOR
...introduced with c1b9d61bacaf676d69a0f49a79fb086535f79a48 "tdf#88276: Add slot and handlers for toolbar|sidebar buttons" Change-Id: Ic63a7766b7f0ccae9144a0ef276e2df63fc22f2e
-rw-r--r--include/editeng/editids.hrc2
-rw-r--r--include/svx/svxids.hrc2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 91102dd0ca8b..286d7a528dc1 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -119,7 +119,7 @@
#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 )
#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 )
#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
#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index f59e3e4db035..c6338220c563 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1015,6 +1015,8 @@
#define SID_EDIT_POSTIT ( SID_SVX_START + 1152 )
+// 1153 is used by editeng (SID_ATTR_CHAR_BACK_COLOR)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (SID_EDIT_POSTIT + 1)