cui/source/inc/helpids.h | 10 ---------- dbaccess/inc/helpids.h | 1 - sc/inc/helpids.h | 6 ------ sd/inc/helpids.h | 8 -------- sfx2/source/inc/helpids.h | 2 -- starmath/inc/helpids.h | 12 ------------ svx/inc/helpids.h | 9 --------- sw/inc/helpids.h | 30 ------------------------------ 8 files changed, 78 deletions(-)
New commits: commit bc74c3c7d8e04b31324f19aa339dfac60cc63eef Author: Gabor Kelemen <kelem...@ubuntu.com> Date: Thu Mar 1 13:37:32 2018 +0100 Remove unused HIDs These were no longer used in the code. This should help me in identifying obsolete and missing HIDs in helpcontent. Found by this somewhat sophisticated method: for mod in $(find -name helpids.h) ; do echo $mod; for i in $(grep ^#define "$mod" | cut -d " " -f2 ) ; do if [ $(git grep -c "$i" $(echo "$mod" | cut -d "/" -f 2 ) | wc -l) -eq 1 ] ; then echo "$i"; fi ; done done Change-Id: Iaf8179322419ce51175bc5a42fedec0add8c5241 Reviewed-on: https://gerrit.libreoffice.org/50680 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index b20b9223d91f..c8b21efef94b 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -36,20 +36,10 @@ #define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM" #define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR" #define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM" -#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR" -#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR" -#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM" -#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM" #define HID_SVX_UP_TOOLBAR_ITEM "CUI_HID_SVX_UP_TOOLBAR_ITEM" #define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM" #define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN" #define HID_SVX_TOPLEVELLISTBOX "CUI_HID_SVX_TOPLEVELLISTBOX" -#define HID_SVX_ICONSONLY "CUI_HID_SVX_ICONSONLY" -#define HID_SVX_TEXTONLY "CUI_HID_SVX_TEXTONLY" -#define HID_SVX_ICONSANDTEXT "CUI_HID_SVX_ICONSANDTEXT" -#define HID_SVX_ADD_SEPARATOR "CUI_HID_SVX_ADD_SEPARATOR" -#define HID_SVX_RESETBUTTON "CUI_HID_SVX_RESETBUTTON" -#define HID_SVX_REMOVEBUTTON "CUI_HID_SVX_REMOVEBUTTON" #define HID_SVX_DESCFIELD "CUI_HID_SVX_DESCFIELD" #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX" diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h index e8d54a4d1193..53032a3e6c43 100644 --- a/dbaccess/inc/helpids.h +++ b/dbaccess/inc/helpids.h @@ -70,7 +70,6 @@ #define HID_CTL_RELATIONTAB "DBACCESS_HID_CTL_RELATIONTAB" #define HID_RELATIONDIALOG_LEFTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL" #define HID_RELATIONDIALOG_RIGHTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL" -#define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO" #define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL" #define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME" #define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME" diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 6d8606c8a246..41822494134b 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -48,8 +48,6 @@ #define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" #define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" -#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" - // wrong group - HID_SC_DLG_START is full #define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" @@ -180,10 +178,6 @@ #define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" #define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" -#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" -#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" -#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" - // End help IDs ------------------------------------------------------------ #define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 26bed2967ffd..64678d7733ad 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -72,14 +72,6 @@ #define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" #define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" - -#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC" -#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD" -#define HID_MN_SUB_TEMPLATES "SD_HID_MN_SUB_TEMPLATES" -#define HID_MN_SUB_SPELLING "SD_HID_MN_SUB_SPELLING" -#define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT" -#define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR" - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/helpids.h b/sfx2/source/inc/helpids.h index 96395079b7c9..4a18af690d12 100644 --- a/sfx2/source/inc/helpids.h +++ b/sfx2/source/inc/helpids.h @@ -39,8 +39,6 @@ #define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG" #define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE" -#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE" - #define HID_QUERY_LOAD_TEMPLATE "SFX2_HID_QUERY_LOAD_TEMPLATE" #define HID_SIDEBAR_WINDOW "SFX2_HID_SIDEBAR_WINDOW" diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h index 024141fc5915..7e13c3ac800b 100644 --- a/starmath/inc/helpids.h +++ b/starmath/inc/helpids.h @@ -48,18 +48,6 @@ #define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" #define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" #define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" -#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" -#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" -#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" -#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" -#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" -#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" -#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" -#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" -#define HID_SMA_XEVALUATEDATY "STARMATH_HID_SMA_XEVALUATEDATY" - - -#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE" #endif diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h index ea53d4d31b3f..c3eead8872ff 100644 --- a/svx/inc/helpids.h +++ b/svx/inc/helpids.h @@ -27,16 +27,9 @@ #define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" #define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" #define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" -#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" -#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" -#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" #define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" -#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" -#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" #define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" -#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" -#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" #define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" #define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" #define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" @@ -47,8 +40,6 @@ #define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" #define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" #define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" -#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" -#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" #define HID_UNDERLINE_BTN "SVX_HID_UNDERLINE_BTN" #define HID_SPACING_MB_KERN "SVX_HID_SPACING_MB_KERN" diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h index fc1fe83aa446..163480a9746c 100644 --- a/sw/inc/helpids.h +++ b/sw/inc/helpids.h @@ -23,15 +23,8 @@ #include "swcommands.h" #include <svx/svxcommands.h> -#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE" - - - #define HID_EDIT_WIN "SW_HID_EDIT_WIN" - -#define HID_SOURCEVIEW "SW_HID_SOURCEVIEW" - #define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP" #define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK" #define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY" @@ -69,31 +62,8 @@ #define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" -// sw::sidebar::PagePropertyPanel -#define HID_SWPAGE_LEFT_MARGIN "HID_SWPAGE_LEFT_MARGIN" -#define HID_SWPAGE_RIGHT_MARGIN "HID_SWPAGE_RIGHT_MARGIN" -#define HID_SWPAGE_TOP_MARGIN "HID_SWPAGE_TOP_MARGIN" -#define HID_SWPAGE_BOTTOM_MARGIN "HID_SWPAGE_BOTTOM_MARGIN" -#define HID_SWPAGE_SIZE_MORE "HID_SWPAGE_SIZE_MORE" -#define HID_SWPAGE_COLUMN_MORE "HID_SWPAGE_COLUMN_MORE" -#define HID_SWPAGE_VS_ORIENTATION "HID_SWPAGE_VS_ORIENTATION" -#define HID_SWPAGE_VS_MARGIN "HID_SWPAGE_VS_MARGIN" -#define HID_SWPAGE_VS_SIZE "HID_SWPAGE_VS_SIZE" -#define HID_SWPAGE_VS_COLUMN "HID_SWPAGE_VS_COLUMN" - -// HelpIds for Menu - -#define HID_MN_SUB_TBLROW "SW_HID_MN_SUB_TBLROW" -#define HID_MN_SUB_TBLCOL "SW_HID_MN_SUB_TBLCOL" -#define HID_MN_SUB_FIELD "SW_HID_MN_SUB_FIELD" -#define HID_MN_SUB_GRAPHIC "SW_HID_MN_SUB_GRAPHIC" -#define HID_MN_SUB_TEMPLATES "SW_HID_MN_SUB_TEMPLATES" -#define HID_MN_SUB_SPELLING "SW_HID_MN_SUB_SPELLING" -#define HID_MN_SUB_MIRROR "SW_HID_MN_SUB_MIRROR" - #define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" #define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" -#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS #define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu // More Help-IDs _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits