tdf#143204 svx: fix SID_ATTR_TEXTCOLUMNS_SPACING SID collision
commit8ea9a8bc43ea054521a44dc8e3bc537110ca9e33
authorHossein <hossein@libreoffice.org>
Tue, 6 Jul 2021 04:58:03 +0000 (6 06:58 +0200)
committerMike Kaganski <mike.kaganski@collabora.com>
Wed, 7 Jul 2021 15:42:19 +0000 (7 17:42 +0200)
treea42340e887e031097fcb39c7097a15e71e1662f4
parentb55389c7c1bff6b555e14a3cef570fcb85091e4d
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 <michael.meeks@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
include/svx/svxids.hrc