include/svx/svxids.hrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6274a47543542a5d163907b3104b15de40831282
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Fri Mar 28 10:54:27 2025 +0100
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Fri Mar 28 14:52:02 2025 +0100
tdf#143305 Remove SID collision in .hrc file
There was some SID collisions in the below file which should have been
avoided:
* include/svx/svxids.hrc
The collision occured over the offset of 450:
$ git grep -n "SID_SVX_START + 450"
svxids.hrc:385:#define SID_EDIT_DIAGRAM ( SID_SVX_START + 450 )
svxids.hrc:542:#define SID_SB_STARBASEOPTIONS ( SID_SVX_START + 450 )
$ git blame -L 542,542 include/svx/svxids.hrc
cb05db521ee51 (Vladimir Glazounov 2007-04-11 15:30:44 +0000 542)
$ git blame -L 385,385 include/svx/svxids.hrc
cfb68712a4916 (Armin Le Grand (Allotropia) 2022-03-02 11:52:14 +0100 385)
As described in 1b4997d7a84d1, it is possible to use grep to make sure
no collision is remaining:
$ git grep -h "SID_SVX_START[ ]*+" *.hrc | grep -Ev '^\s*\/\/' \
|awk -F\( {'print $2'} | awk -F\) {'print $1'} \
|awk '{gsub(/^ +| +$/,"")}1'|sort|uniq -c|grep -v " 1"
If there are any results, it means occurrence of some collision.
Change-Id: I252c582bac7d92e98e56c2834715e1766244aa52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183446
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index f2a4dd602e2b..e815e4a3f165 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -382,7 +382,6 @@ class XFillGradientItem;
#define SID_SPELLCHECK_IGNORE_ALL ( SID_SVX_START + 247 )
#define SID_SPELLCHECK_APPLY_SUGGESTION ( SID_SVX_START + 248 )
#define SID_REGENERATE_DIAGRAM ( SID_SVX_START + 249 )
-#define SID_EDIT_DIAGRAM ( SID_SVX_START + 450 )
// CAUTION! Range <250 .. 250> used by EditEngine (!)
@@ -539,6 +538,7 @@ class XFillGradientItem;
#define SID_SPELLCHECKER_CHANGED ( SID_SVX_START + 446 )
#define SID_SD_GRAPHIC_OPTIONS ( SID_SVX_START + 447 )
#define SID_SM_TP_PRINTOPTIONS ( SID_SVX_START + 448 )
+#define SID_EDIT_DIAGRAM ( SID_SVX_START + 449 )
#define SID_SB_STARBASEOPTIONS ( SID_SVX_START + 450 )
#define SID_SWREGISTER_COLLECTION
TypedWhichId<SfxStringItem>( SID_SVX_START + 451 )
#define SID_FILTER_DLG ( SID_SVX_START + 452 )
