From 8ea9a8bc43ea054521a44dc8e3bc537110ca9e33 Mon Sep 17 00:00:00 2001 From: Hossein Date: Tue, 6 Jul 2021 06:58:03 +0200 Subject: tdf#143204 svx: fix SID_ATTR_TEXTCOLUMNS_SPACING SID collision These two SIDs have the same ID, which is fixed now: * include/sfx2/sfxsids.hrc: #define SID_NOTEBOOKBAR (SID_SVX_START + 338) * include/svx/svxids.hrc: #define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 338 ) The symptom tdf#143204 is that the tabbed interface was hidden in Impress or Draw, which is now fixed. Looking at b66d87086804460c1986df1b832fd6b2ea075a90 (2014-04-01) we read: 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. Also in include/sfx2/sfxsids.hrc:551 slot IDs from SVX (svxids.hrc) ------------------------------------ These SID_SVX_START entries came from include/svx/svxids.hrc, avoid accidentally colliding entries with include/svx/svxids.hrc and include/editeng/editids.hrc. Only add new SID_SVX_START entries to include/svx/svxids.hrc Change-Id: I5e8c14bdbaa72f1b030a686dd5fffc9ae8dd1306 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118459 Tested-by: Jenkins Reviewed-by: Michael Meeks Reviewed-by: Mike Kaganski --- include/svx/svxids.hrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/svx/svxids.hrc') diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 6b23b3176f17..ac0373e2ad97 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -438,8 +438,8 @@ class SdrAngleItem; //#define SID_SIDEBAR ( SID_SVX_START + 336 ) -> sfxsids.hrc -#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 337 ) -#define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 338 ) +#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 340) +#define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 341 ) #define SID_SB_CONNECTIONPOOLING ( SID_SVX_START + 348 ) #define SID_SB_DBREGISTEROPTIONS ( SID_SVX_START + 349 ) -- cgit