include/svx/svxids.hrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit b66d87086804460c1986df1b832fd6b2ea075a90 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Apr 1 18:59:12 2014 +0200 svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID As commit 669ad519902e21e0cb3537fb7e203987f75a4077 (colliding SID_SVX_START based ids, 2013-06-24) suggests, new SID_SVX_START-based SID's shouldn't be added to include/editeng/editids.hrc. However, if it was done, at least add a comment about it to include/svx/svxids.hrc, so it becomes obvious that the two slots have the same ID. This makes Format -> Frame -> Area -> Bitmap have the Import Graphic button again. Change-Id: I2fc852200d3cc5dfbf073ed615ac83a46040e16c diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index f8921ad..a4fe309 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -1020,9 +1020,10 @@ #define SID_ATTR_BORDER_STYLES ( SID_SVX_START + 1140 ) #define SID_ATTR_BORDER_DEFAULT_WIDTH ( SID_SVX_START + 1141 ) +// 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG) //UUUU -#define SID_OFFER_IMPORT ( SID_SVX_START + 1142 ) +#define SID_OFFER_IMPORT ( SID_SVX_START + 1143 ) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_OFFER_IMPORT + 1) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits