CWS changehid: remove duplicated definitions of HIDs

3 files changed, 1 insertions, 60 deletions

diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 60374f226edf..b87082b56cbd 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -28,9 +28,8 @@
 #ifndef _SVTOOLS_IODLGIMPL_HRC
 #define _SVTOOLS_IODLGIMPL_HRC
 
-#ifndef _SVTOOLS_HRC
 #include "svtools/svtools.hrc"
-#endif
+#include "svtools/helpid.hrc"
 
 // ModalDialog DLG_SVT_EXPLORERFILE
 
@@ -86,22 +85,5 @@
 #define SID_SFX_START                       5000
 #define SID_OPENURL                     (SID_SFX_START + 596)
 
-#define HID_FILEDLG_STANDARD                               "FPICKER_HID_FILEDLG_STANDARD"
-#define HID_FILEDLG_MANAGER                                "FPICKER_HID_FILEDLG_MANAGER"
-#define HID_FILEDLG_URL                                    "FPICKER_HID_FILEDLG_URL"
-#define HID_FILEDLG_USE_PASSWD                             "FPICKER_HID_FILEDLG_USE_PASSWD"
-#define HID_FILEDLG_READ_ONLY                              "FPICKER_HID_FILEDLG_READ_ONLY"
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX                        "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX"
-#define HID_FILEDLG_SAVE_BTN                               "FPICKER_HID_FILEDLG_SAVE_BTN"
-#define HID_FILEDLG_SAVE_FILENAME                          "FPICKER_HID_FILEDLG_SAVE_FILENAME"
-#define HID_FILEDLG_SAVE_FILETYPE                          "FPICKER_HID_FILEDLG_SAVE_FILETYPE"
-#define HID_FILEDLG_INSERT_BTN                             "FPICKER_HID_FILEDLG_INSERT_BTN"
-#define HID_FILEDLG_PATH_BTN                               "FPICKER_HID_FILEDLG_PATH_BTN"
-#define HID_FILEDLG_PATH_FILENAME                          "FPICKER_HID_FILEDLG_PATH_FILENAME"
-#define HID_FILEDLG_FOLDER_BTN                             "FPICKER_HID_FILEDLG_FOLDER_BTN"
-#define HID_FILEDLG_FOLDER_FILENAME                        "FPICKER_HID_FILEDLG_FOLDER_FILENAME"
-#define HID_FILEDLG_SRCHFOLDER_BTN                         "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN"
-
 #endif
 
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index e67291469f7d..ef5c168c36f0 100755
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -53,12 +53,6 @@
 #define HID_DOCINFORELOAD                                     "SFX2_HID_DOCINFORELOAD"
 #define HID_NEWS_GROUPPAGE                                    "SFX2_HID_NEWS_GROUPPAGE"
 #define HID_NEWS_SERVERPAGE                                   "SFX2_HID_NEWS_SERVERPAGE"
-#define HID_FILEDLG_STANDARD                                  "SFX2_HID_FILEDLG_STANDARD"
-#define HID_FILEDLG_MANAGER                                   "SFX2_HID_FILEDLG_MANAGER"
-#define HID_FILEDLG_URL                                       "SFX2_HID_FILEDLG_URL"
-#define HID_FILEDLG_FILE                                      "SFX2_HID_FILEDLG_FILE"
-#define HID_FILEDLG_USE_PASSWD                                "SFX2_HID_FILEDLG_USE_PASSWD"
-#define HID_FILEDLG_READ_ONLY                                 "SFX2_HID_FILEDLG_READ_ONLY"
 #define HID_EXPLORERCONTROL                                   "SFX2_HID_EXPLORERCONTROL"
 #define HID_BROWSERCONTROL                                    "SFX2_HID_BROWSERCONTROL"
 #define HID_CTL_ORGANIZER_LEFT                                "SFX2_HID_CTL_ORGANIZER_LEFT"
@@ -234,26 +228,12 @@
 #define HID_GROUPVIEW_SHOW_DOCS                               "SFX2_HID_GROUPVIEW_SHOW_DOCS"
 #define HID_EDIT_TEMPLATE                                     "SFX2_HID_EDIT_TEMPLATE"
 #define HID_PDFOLDERS_GRAPHICS                                "SFX2_HID_PDFOLDERS_GRAPHICS"
-#define HID_FILEDLG_AUTOCOMPLETEBOX                           "SFX2_HID_FILEDLG_AUTOCOMPLETEBOX"
-#define HID_FILEDLG_SAVE_BTN                                  "SFX2_HID_FILEDLG_SAVE_BTN"
-#define HID_FILEDLG_SAVE_FILENAME                             "SFX2_HID_FILEDLG_SAVE_FILENAME"
-#define HID_FILEDLG_SAVE_FILETYPE                             "SFX2_HID_FILEDLG_SAVE_FILETYPE"
-#define HID_FILEDLG_INSERT_BTN                                "SFX2_HID_FILEDLG_INSERT_BTN"
-#define HID_FILEDLG_PATH_BTN                                  "SFX2_HID_FILEDLG_PATH_BTN"
-#define HID_FILEDLG_PATH_FILENAME                             "SFX2_HID_FILEDLG_PATH_FILENAME"
-#define HID_FILEDLG_FOLDER_BTN                                "SFX2_HID_FILEDLG_FOLDER_BTN"
-#define HID_FILEDLG_FOLDER_FILENAME                           "SFX2_HID_FILEDLG_FOLDER_FILENAME"
-#define HID_FILEDLG_SRCHFOLDER_BTN                            "SFX2_HID_FILEDLG_SRCHFOLDER_BTN"
 #define HID_PDFOLDERS_GROUPS                                  "SFX2_HID_PDFOLDERS_GROUPS"
 #define HID_OPEN_CHOOSE_FILTER                                "SFX2_HID_OPEN_CHOOSE_FILTER"
 #define HID_PDFOLDERS_BOOKMARKS                               "SFX2_HID_PDFOLDERS_BOOKMARKS"
 #define HID_PDFOLDERS_FAVORITES_ADD                           "SFX2_HID_PDFOLDERS_FAVORITES_ADD"
 #define HID_PDFOLDERS_FAVORITES_REMOVE                        "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE"
 #define HID_PDFOLDERS_HISTORY                                 "SFX2_HID_PDFOLDERS_HISTORY"
-#define HID_FILEDLG_EDIT_FAVORITES                            "SFX2_HID_FILEDLG_EDIT_FAVORITES"
-#define HID_FILEDLG_NEW_FAVORITE                              "SFX2_HID_FILEDLG_NEW_FAVORITE"
-#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX                    "SFX2_HID_FILEDLG_EDIT_FAVORITES_LISTBOX"
-#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR                  "SFX2_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR"
 #define HID_CNT_CB_FORCE_BODY_EXPORT                          "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT"
 #define HID_CNT_PAGE_REPSTATE_CONTROL                         "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL"
 #define HID_TASKSTATUSBAR                                     "SFX2_HID_TASKSTATUSBAR"
@@ -319,7 +299,6 @@
 #define HID_HELP_TEXT_SELECTION_MODE                          "SFX2_HID_HELP_TEXT_SELECTION_MODE"
 
 #define HID_WARNING_SECURITY_HYPERLINK                        "SFX2_HID_WARNING_SECURITY_HYPERLINK"
-#define HID_FILEDLG_EXPORTASPDF                               "SFX2_HID_FILEDLG_EXPORTASPDF"
 #define HID_USERDEFBMP_TOOLBOX                                "SFX2_HID_USERDEFBMP_TOOLBOX"
 
 #define HID_CONFIG_LOAD                                       "SFX2_HID_CONFIG_LOAD"
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index ccce4820cf2f..72bd77c5c011 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -31,12 +31,6 @@ hidspecial HID_APP_WIN                          { HelpID = HID_APP_WIN; };
 hidspecial HID_DESKTOP                          { HelpID = HID_DESKTOP; };
 hidspecial HID_DOCINFO_FRAME                    { HelpID = HID_DOCINFO_FRAME; };
 hidspecial HID_EXPLORER_FRAME                   { HelpID = HID_EXPLORER_FRAME; };
-hidspecial HID_FILEDLG_FILE                     { HelpID = HID_FILEDLG_FILE; };
-hidspecial HID_FILEDLG_MANAGER                  { HelpID = HID_FILEDLG_MANAGER; };
-hidspecial HID_FILEDLG_READ_ONLY                { HelpID = HID_FILEDLG_READ_ONLY; };
-hidspecial HID_FILEDLG_STANDARD                 { HelpID = HID_FILEDLG_STANDARD; };
-hidspecial HID_FILEDLG_URL                      { HelpID = HID_FILEDLG_URL; };
-hidspecial HID_FILEDLG_USE_PASSWD               { HelpID = HID_FILEDLG_USE_PASSWD; };
 hidspecial HID_PREVIEW_FRAME                    { HelpID = HID_PREVIEW_FRAME; };
 hidspecial HID_PRINT_OPTIONS                    { HelpID = HID_PRINT_OPTIONS; };
 hidspecial HID_TEMPLATE_FILTER                  { HelpID = HID_TEMPLATE_FILTER; };
@@ -70,18 +64,6 @@ hidspecial HID_CNT_LB_DESCRIPTION               { HelpID = HID_CNT_LB_DESCRIPTIO
 hidspecial HID_GROUPVIEW_CONTENT_BIG            { HelpID = HID_GROUPVIEW_CONTENT_BIG; };
 hidspecial HID_GROUPVIEW_CONTENT_SMALL          { HelpID = HID_GROUPVIEW_CONTENT_SMALL; };
 hidspecial HID_GROUPVIEW_CONTENT_TREE           { HelpID = HID_GROUPVIEW_CONTENT_TREE; };
-hidspecial HID_FILEDLG_AUTOCOMPLETEBOX          { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; };
-hidspecial HID_FILEDLG_SAVE_BTN                 { HelpID = HID_FILEDLG_SAVE_BTN; };
-hidspecial HID_FILEDLG_SAVE_FILENAME            { HelpID = HID_FILEDLG_SAVE_FILENAME; };
-hidspecial HID_FILEDLG_SAVE_FILETYPE            { HelpID = HID_FILEDLG_SAVE_FILETYPE; };
-hidspecial HID_FILEDLG_INSERT_BTN               { HelpID = HID_FILEDLG_INSERT_BTN; };
-hidspecial HID_FILEDLG_PATH_BTN                 { HelpID = HID_FILEDLG_PATH_BTN; };
-hidspecial HID_FILEDLG_PATH_FILENAME            { HelpID = HID_FILEDLG_PATH_FILENAME; };
-hidspecial HID_FILEDLG_FOLDER_BTN               { HelpID = HID_FILEDLG_FOLDER_BTN; };
-hidspecial HID_FILEDLG_FOLDER_FILENAME          { HelpID = HID_FILEDLG_FOLDER_FILENAME; };
-hidspecial HID_FILEDLG_SRCHFOLDER_BTN           { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX   { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; };
 hidspecial HID_BROWSERCONTROL                   { HelpID = HID_BROWSERCONTROL; };
 hidspecial HID_TASKSTATUSBAR                    { HelpID = HID_TASKSTATUSBAR; };
 hidspecial HID_CNT_PAGE_HEADER_TABBAR           { HelpID = HID_CNT_PAGE_HEADER_TABBAR; };
@@ -106,8 +88,6 @@ hidspecial HID_CNT_SENT_VIEW_SENT_ARTICLES      { HelpID = HID_CNT_SENT_VIEW_SEN
 hidspecial HID_CNT_SENT_VIEW_UNSENT_ARTICLES    { HelpID = HID_CNT_SENT_VIEW_UNSENT_ARTICLES; };
 hidspecial HID_CNT_SENT_VIEW_MARKED_ARTICLES    { HelpID = HID_CNT_SENT_VIEW_MARKED_ARTICLES; };
 hidspecial HID_TABDLG_APPLY_BTN                 { HelpID = HID_TABDLG_APPLY_BTN; };
-hidspecial HID_FILEDLG_LINK_CB                  { HelpID = HID_FILEDLG_LINK_CB; };
-hidspecial HID_FILEDLG_PREVIEW_CB               { HelpID = HID_FILEDLG_PREVIEW_CB; };
 hidspecial HID_HELP_WINDOW                      { HelpID = HID_HELP_WINDOW; };
 hidspecial HID_HELP_TOOLBOX                     { HelpID = HID_HELP_TOOLBOX; };
 hidspecial HID_HELP_TOOLBOXITEM_INDEX           { HelpID = HID_HELP_TOOLBOXITEM_INDEX; };