include/editeng/editids.hrc | 2 +-
include/svx/svxids.hrc | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ff7410fe4bc7518787afef5bd8a43760cb3d633c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Aug 4 18:45:15 2015 +0200
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
(cherry picked from commit 4275056a90eb9e178062276cc104ac2b94db13ca)
Reviewed-on: https://gerrit.libreoffice.org/17508
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 91102dd..286d7a5 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 ed45af0..d210579 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1010,6 +1010,8 @@
#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
#define SID_SVX_FIRSTFREE (SID_EDIT_POSTIT + 1)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
