huge hrc and src file cleanup

* mostly fallout from ui conversion
* some completely unused defines from src files
* lots of unused HID ids

Change-Id: I976561205798db3d06ee139de6223f638e58f47a
Reviewed-on: https://gerrit.libreoffice.org/9142
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>

10 files changed, 2 insertions, 148 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 5128e46ec05d..eae7fa91df5a 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -27,25 +27,14 @@
 #define UID_DATABROWSE_DATAWINDOW                         "DBACCESS_UID_DATABROWSE_DATAWINDOW"
 #define HID_CTL_TREEVIEW                                  "DBACCESS_HID_CTL_TREEVIEW"
 #define UID_CTL_CONTENT                                   "DBACCESS_UID_CTL_CONTENT"
-#define HID_TLB_TABBROWSER                                "DBACCESS_HID_TLB_TABBROWSER"
 #define HID_TLB_TREELISTBOX                               "DBACCESS_HID_TLB_TREELISTBOX"
 
-#define HID_DSADMIN_PAGE_GENERAL                          "DBACCESS_HID_DSADMIN_PAGE_GENERAL"
 #define HID_DSADMIN_PAGE_DBASE                            "DBACCESS_HID_DSADMIN_PAGE_DBASE"
-#define HID_DSADMIN_PAGE_JDBC                             "DBACCESS_HID_DSADMIN_PAGE_JDBC"
 #define HID_DSADMIN_PAGE_ODBC                             "DBACCESS_HID_DSADMIN_PAGE_ODBC"
 #define HID_DSADMIN_PAGE_TEXT                             "DBACCESS_HID_DSADMIN_PAGE_TEXT"
-#define HID_DSADMIN_DSACTIONS_NEWDS                       "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS"
-#define HID_DSADMIN_DSACTIONS_DELETEDS                    "DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS"
-#define HID_DSADMIN_DSACTIONS_RESTOREDS                   "DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS"
-#define HID_DSADMIN_DSNAME                                "DBACCESS_HID_DSADMIN_DSNAME"
-#define HID_DSADMIN_DSTYPE                                "DBACCESS_HID_DSADMIN_DSTYPE"
 #define HID_DSADMIN_URL_GENERAL                           "DBACCESS_HID_DSADMIN_URL_GENERAL"
 #define HID_DSADMIN_BROWSECONN                            "DBACCESS_HID_DSADMIN_BROWSECONN"
-#define HID_DSADMIN_LOGINTIMEOUT_NUMBER                   "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_NUMBER"
-#define HID_DSADMIN_LOGINTIMEOUT_UNIT                     "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_UNIT"
 #define HID_DSADMIN_SHOWDELETED                           "DBACCESS_HID_DSADMIN_SHOWDELETED"
-#define HID_DSADMIN_ALLOWLONG                             "DBACCESS_HID_DSADMIN_ALLOWLONG"
 #define HID_DSADMIN_DBASE_INDICIES                        "DBACCESS_HID_DSADMIN_DBASE_INDICIES"
 #define HID_DSADMIN_DRIVERCLASS                           "DBACCESS_HID_DSADMIN_DRIVERCLASS"
 #define HID_DSADMIN_ODBC_OPTIONS                          "DBACCESS_HID_DSADMIN_ODBC_OPTIONS"
@@ -54,12 +43,6 @@
 #define HID_DSADMIN_TEXT_SEPARATOR                        "DBACCESS_HID_DSADMIN_TEXT_SEPARATOR"
 #define HID_DSADMIN_DECIMAL_SEPARATOR                     "DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR"
 #define HID_DSADMIN_THOUSANDS_SEPARATOR                   "DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR"
-#define HID_DSADMIN_EXTENSION                             "DBACCESS_HID_DSADMIN_EXTENSION"
-#define HID_DSADMIN_ALL_TABLES                            "DBACCESS_HID_DSADMIN_ALL_TABLES"
-#define HID_DSADMIN_NO_TABLES                             "DBACCESS_HID_DSADMIN_NO_TABLES"
-#define HID_DSADMIN_SELECT_TABLES                         "DBACCESS_HID_DSADMIN_SELECT_TABLES"
-
-#define HID_GENERIC_SQL_ERROR                             "DBACCESS_HID_GENERIC_SQL_ERROR"
 
 #define HID_BROWSER_COLUMNFORMAT                          "DBACCESS_HID_BROWSER_COLUMNFORMAT"
 #define HID_BROWSER_COLUMNWIDTH                           "DBACCESS_HID_BROWSER_COLUMNWIDTH"
@@ -67,30 +50,16 @@
 #define HID_BROWSER_ROWHEIGHT                             "DBACCESS_HID_BROWSER_ROWHEIGHT"
 #define HID_BROWSER_EDIT_DATABASE                         "DBACCESS_HID_BROWSER_EDIT_DATABASE"
 #define HID_BROWSER_CLOSECONN                             "DBACCESS_HID_BROWSER_CLOSECONN"
-#define HID_BROWSER_REFRESHCONN                           "DBACCESS_HID_BROWSER_REFRESHCONN"
 
-#define HID_TLB_QUERYDESIGN                               "DBACCESS_HID_TLB_QUERYDESIGN"
 #define HID_CTL_QRYSQLEDIT                                "DBACCESS_HID_CTL_QRYSQLEDIT"
-#define HID_DSADMIN_SPECIAL_MESSAGE                       "DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE"
 
 #define HID_BROWSER_QUERY_CREATE_TEXT                     "DBACCESS_HID_BROWSER_QUERY_CREATE_TEXT"
 
-#define HID_DLG_ERROR                                     "DBACCESS_HID_DLG_ERROR"
-#define HID_DLG_TEXT                                      "DBACCESS_HID_DLG_TEXT"
 #define UID_SQLERROR_BUTTONMORE                           "DBACCESS_UID_SQLERROR_BUTTONMORE"
 
-#define HID_BROWSER_QUERY_EDIT                            "DBACCESS_HID_BROWSER_QUERY_EDIT"
-#define HID_BROWSER_QUERY_DELETE                          "DBACCESS_HID_BROWSER_QUERY_DELETE"
-
-#define HID_DSADMIN_USER_ADO                              "DBACCESS_HID_DSADMIN_USER_ADO"
-#define HID_DSADMIN_PWDREC_ADO                            "DBACCESS_HID_DSADMIN_PWDREC_ADO"
-#define HID_DSADMIN_CONNURL_ADOPAGE                       "DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE"
 #define HID_DSADMIN_PAGE_ADO                              "DBACCESS_HID_DSADMIN_PAGE_ADO"
 
-
 #define HID_CTL_QRYDGNTAB                                 "DBACCESS_HID_CTL_QRYDGNTAB"
-#define HID_DLG_QRY_HELPTEXT                              "DBACCESS_HID_DLG_QRY_HELPTEXT"
-
 #define HID_CTL_QRYDGNCRIT                                "DBACCESS_HID_CTL_QRYDGNCRIT"
 #define HID_QRYDGN_ROW_VISIBLE                            "DBACCESS_HID_QRYDGN_ROW_VISIBLE"
 #define HID_QRYDGN_ROW_TABLE                              "DBACCESS_HID_QRYDGN_ROW_TABLE"
@@ -107,18 +76,9 @@
 
 #define HID_BROWSER_QUERY_CREATE_DESIGN                   "DBACCESS_HID_BROWSER_QUERY_CREATE_DESIGN"
 
-#define HID_DSADMIN_QUERIES                               "DBACCESS_HID_DSADMIN_QUERIES"
-#define HID_DSADMIN_QUERIES_NEW                           "DBACCESS_HID_DSADMIN_QUERIES_NEW"
-#define HID_DSADMIN_QUERIES_EDIT                          "DBACCESS_HID_DSADMIN_QUERIES_EDIT"
-#define HID_DSADMIN_QUERIES_DELETE                        "DBACCESS_HID_DSADMIN_QUERIES_DELETE"
-#define HID_DSADMIN_QUERYADMINISTRATION                   "DBACCESS_HID_DSADMIN_QUERYADMINISTRATION"
-
-
-#define HID_TAB_DESIGN_TABLE_DESC                         "DBACCESS_HID_TAB_DESIGN_TABLE_DESC"
 #define HID_TAB_DESIGN_FIELDCONTROL                       "DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"
 #define HID_TABLE_DESIGN_HELP_WINDOW                      "DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW"
 #define HID_TAB_DESIGN_DESCWIN                            "DBACCESS_HID_TAB_DESIGN_DESCWIN"
-#define HID_TAB_DESIGN_TABLE_PROPS                        "DBACCESS_HID_TAB_DESIGN_TABLE_PROPS"
 #define HID_TABDESIGN_BACKGROUND                          "DBACCESS_HID_TABDESIGN_BACKGROUND"
 #define HID_CTL_TABLEEDIT                                 "DBACCESS_HID_CTL_TABLEEDIT"
 #define HID_TABDESIGN_NAMECELL                            "DBACCESS_HID_TABDESIGN_NAMECELL"
@@ -126,7 +86,6 @@
 #define HID_TABDESIGN_COMMENTCELL                         "DBACCESS_HID_TABDESIGN_COMMENTCELL"
 #define HID_TABLEDESIGN_INSERTROWS                        "DBACCESS_HID_TABLEDESIGN_INSERTROWS"
 #define HID_TABLEDESIGN_TABED_PRIMARYKEY                  "DBACCESS_HID_TABLEDESIGN_TABED_PRIMARYKEY"
-#define HID_TLB_TABLEDESIGN                               "DBACCESS_HID_TLB_TABLEDESIGN"
 #define HID_TAB_DESIGN_HELP_TEXT_FRAME                    "DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"
 #define HID_TABLE_DESIGN_TABPAGE_GENERAL                  "DBACCESS_HID_TABLE_DESIGN_TABPAGE_GENERAL"
 #define HID_TAB_ENT_DEFAULT                               "DBACCESS_HID_TAB_ENT_DEFAULT"
@@ -142,8 +101,6 @@
 #define HID_TAB_ENT_LEN                                   "DBACCESS_HID_TAB_ENT_LEN"
 #define HID_TAB_ENT_SCALE                                 "DBACCESS_HID_TAB_ENT_SCALE"
 #define HID_BROWSER_TABLE_CREATE_DESIGN                   "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN"
-#define HID_BROWSER_TABLE_EDIT                            "DBACCESS_HID_BROWSER_TABLE_EDIT"
-#define HID_BROWSER_TABLE_DELETE                          "DBACCESS_HID_BROWSER_TABLE_DELETE"
 #define HID_TAB_WIZ_COLUMN_SELECT                         "DBACCESS_HID_TAB_WIZ_COLUMN_SELECT"
 #define HID_TAB_WIZ_TYPE_SELECT                           "DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
 #define HID_TAB_NAMEMATCHING_COLS_AVAIL                   "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
@@ -151,27 +108,16 @@
 #define HID_TAB_WIZ_COPYTABLE                             "DBACCESS_HID_TAB_WIZ_COPYTABLE"
 #define HID_TAB_WIZ_TABLENAME_EDIT                        "DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT"
 #define HID_CTL_RELATIONTAB                               "DBACCESS_HID_CTL_RELATIONTAB"
-#define HID_TLB_RELATIONDESIGN                            "DBACCESS_HID_TLB_RELATIONDESIGN"
 #define HID_RELATIONDIALOG_LEFTFIELDCELL                  "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
 #define HID_RELATIONDIALOG_RIGHTFIELDCELL                 "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
-#define HID_BROWSER_RELATION_DESIGN                       "DBACCESS_HID_BROWSER_RELATION_DESIGN"
-#define HID_TABLE_DESIGN_NO_CONNECTION                    "DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION"
-#define HID_DSADMIN_CREATEDATABASE                        "DBACCESS_HID_DSADMIN_CREATEDATABASE"
 #define HID_BROWSER_COLUMNINFO                            "DBACCESS_HID_BROWSER_COLUMNINFO"
 #define HID_DSADMIN_USECATALOG                            "DBACCESS_HID_DSADMIN_USECATALOG"
 #define HID_BROWSER_VIEW_CREATE_DESIGN                    "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN"
-#define HID_DSADMIN_DOCUMENTS                             "DBACCESS_HID_DSADMIN_DOCUMENTS"
-#define HID_DSADMIN_DOCUMENTLINKS                         "DBACCESS_HID_DSADMIN_DOCUMENTLINKS"
 #define HID_CONFIRM_DROP_BUTTON_ALL                       "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
-#define HID_DSBROWSER_BOOKMARK_SELECTED                   "DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED"
-#define HID_DSADMIN_TABLE_TOOLBOX                         "DBACCESS_HID_DSADMIN_TABLE_TOOLBOX"
-#define HID_DSADMIN_QUERY_TOOLBOX                         "DBACCESS_HID_DSADMIN_QUERY_TOOLBOX"
-#define HID_DSADMIN_BOOKMARK_TOOLBOX                      "DBACCESS_HID_DSADMIN_BOOKMARK_TOOLBOX"
 #define HID_DSADMIN_PAGE_LDAP                             "DBACCESS_HID_DSADMIN_PAGE_LDAP"
 #define HID_DSADMIN_LDAP_HOSTNAME                         "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"
 #define HID_DSADMIN_LDAP_BASEDN                           "DBACCESS_HID_DSADMIN_LDAP_BASEDN"
 #define HID_DSADMIN_LDAP_PORTNUMBER                       "DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER"
-#define HID_DSBROWSER_BOOKMARKSELECTED                    "DBACCESS_HID_DSBROWSER_BOOKMARKSELECTED"
 #define HID_DSBROWSER_DISCONNECTING                       "DBACCESS_HID_DSBROWSER_DISCONNECTING"
 #define HID_TAB_PAGE_USERADMIN                            "DBACCESS_HID_TAB_PAGE_USERADMIN"
 #define HID_TAB_PAGE_PBUSER                               "DBACCESS_HID_TAB_PAGE_PBUSER"
@@ -179,15 +125,9 @@
 #define HID_TAB_PAGE_PBUSERDELETE                         "DBACCESS_HID_TAB_PAGE_PBUSERDELETE"
 #define HID_TAB_PAGE_TBLGRANTS                            "DBACCESS_HID_TAB_PAGE_TBLGRANTS"
 #define HID_TAB_PAGE_LBUSER                               "DBACCESS_HID_TAB_PAGE_LBUSER"
-#define HID_DSBROWSER_DIRECTSQL                           "DBACCESS_HID_DSBROWSER_DIRECTSQL"
 #define HID_DSADMIN_LDAP_ROWCOUNT                         "DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT"
-#define HID_BROWSER_QUERY_EDITSQL                         "DBACCESS_HID_BROWSER_QUERY_EDITSQL"
-#define HID_DSADMIN_PAGE_MOZILLA                          "DBACCESS_HID_DSADMIN_PAGE_MOZILLA"
 #define HID_DSADMIN_MOZILLA_PROFILE_NAME                  "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
 #define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME              "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
-#define HID_BROWSER_OPEN_DOCUMENT                         "DBACCESS_HID_BROWSER_OPEN_DOCUMENT"
-#define HID_BROWSER_EDIT_DOCUMENT                         "DBACCESS_HID_BROWSER_EDIT_DOCUMENT"
-#define HID_BROWSER_BEW_DOCUMENT                          "DBACCESS_HID_BROWSER_BEW_DOCUMENT"
 
 #define HID_DLGIDX_NEWINDEX                               "DBACCESS_HID_DLGIDX_NEWINDEX"
 #define HID_DLGIDX_DROPINDEX                              "DBACCESS_HID_DLGIDX_DROPINDEX"
@@ -200,35 +140,18 @@
 #define HID_DLGINDEX_INDEXDETAILS_FIELD                   "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
 #define HID_DLGINDEX_INDEXDETAILS_SORTORDER               "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"
 
-#define HID_DOCLINKEDIT_URL                               "DBACCESS_HID_DOCLINKEDIT_URL"
-#define HID_QUERY_SQLMODE                                 "DBACCESS_HID_QUERY_SQLMODE"
-
-#define HID_BROWSER_REFRESH_REBUILDVIEW                   "DBACCESS_HID_BROWSER_REFRESH_REBUILDVIEW"
-#define HID_BROWSER_RENAME_ENTRY                          "DBACCESS_HID_BROWSER_RENAME_ENTRY"
-
 #define HID_QUERY_EDIT_JOINCONNECTION                     "DBACCESS_HID_QUERY_EDIT_JOINCONNECTION"
 
 #define HID_DOCUMENT_CREATE_REPWIZ                        "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
 #define HID_TAB_AUTOINCREMENTVALUE                        "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
 
-#define HID_DSADMIN_PAGE_MYSQL_ODBC                       "DBACCESS_HID_DSADMIN_PAGE_MYSQL_ODBC"
-#define HID_TAB_PAGE_TABLEPRIVILEGES                      "DBACCESS_HID_TAB_PAGE_TABLEPRIVILEGES"
-
 #define HID_DSADMIN_PAGE_USERDRIVER                       "DBACCESS_HID_DSADMIN_PAGE_USERDRIVER"
-#define HID_DSADMIN_USER_DEFINED                          "DBACCESS_HID_DSADMIN_USER_DEFINED"
-#define HID_DSADMIN_USERDEF_OPTIONS                       "DBACCESS_HID_DSADMIN_USERDEF_OPTIONS"
-#define HID_DSADMIN_CHARSET_USERDEF                       "DBACCESS_HID_DSADMIN_CHARSET_USERDEF"
 #define HID_DSADMIN_USESSL_LDAP                           "DBACCESS_HID_DSADMIN_USESSL_LDAP"
-#define HID_BROWSER_QUERY_WIZARD                          "DBACCESS_HID_BROWSER_QUERY_WIZARD"
-
-#define HID_DSADMIN_PAGE_MYSQL_JDBC                       "DBACCESS_HID_DSADMIN_PAGE_MYSQL_JDBC"
-
 #define HID_DSADMIN_DBASE_PATH                            "DBACCESS_HID_DSADMIN_DBASE_PATH"
 #define HID_DSADMIN_MYSQL_DATABASE                        "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
 #define HID_DSADMIN_MYSQL_ODBC_DATASOURCE                 "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"
 #define HID_DSADMIN_ODBC_DATASOURCE                       "DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"
 #define HID_DSADMIN_MSACCESS_MDB_FILE                     "DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"
-#define HID_DSADMIN_PAGE_MSACCESS                         "DBACCESS_HID_DSADMIN_PAGE_MSACCESS"
 #define HID_DSADMIN_FLAT_PATH                             "DBACCESS_HID_DSADMIN_FLAT_PATH"
 #define HID_DSADMIN_CALC_PATH                             "DBACCESS_HID_DSADMIN_CALC_PATH"
 #define HID_DSADMIN_ORACLE_DATABASE                       "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
@@ -239,7 +162,6 @@
 #define HID_APP_QUERY_TREE                                "DBACCESS_HID_APP_QUERY_TREE"
 #define HID_APP_REPORT_TREE                               "DBACCESS_HID_APP_REPORT_TREE"
 #define UID_APP_DETAIL_VIEW                               "DBACCESS_UID_APP_DETAIL_VIEW"
-#define UID_APP_VIEW_VERT_SPLIT                           "DBACCESS_UID_APP_VIEW_VERT_SPLIT"
 #define UID_APP_VIEW_BORDER_WIN                           "DBACCESS_UID_APP_VIEW_BORDER_WIN"
 #define HID_APP_CREATION_LIST                             "DBACCESS_HID_APP_CREATION_LIST"
 #define UID_APP_SWAP_VIEW                                 "DBACCESS_UID_APP_SWAP_VIEW"
@@ -274,26 +196,16 @@
 
 #define HID_BROWSER_ADMINISTRATE                          "DBACCESS_HID_BROWSER_ADMINISTRATE"
 
-#define HID_PAGE_DBWIZARD_GENERALPAGE                     "DBACCESS_HID_PAGE_DBWIZARD_GENERALPAGE"
-#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE     "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE"
-#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE  "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE"
-
 #define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION          "DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION"
 #define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION          "DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION"
 
-
 #define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES          "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES"
 #define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES          "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES"
 #define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES        "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES"
 #define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION            "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION"
 
-
 #define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE        "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE"
 #define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE        "DBACCESS_HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE"
-#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR          "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR           "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR        "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR"
-#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR      "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR"
 
 #define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION    "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION"
 #define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION    "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION"
@@ -302,7 +214,6 @@
 #define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN                  "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN"
 #define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER              "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER"
 #define HID_PAGE_DBWIZARD_LDAP_CB_USESSL                  "DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL"
-#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION      "DBACCESS_HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION"
 
 #define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC         "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC"
 #define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC         "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC"
@@ -325,10 +236,8 @@
 #define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS              "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS"
 #define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS          "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS"
 
-
 #define HID_PAGE_DBWIZARD_ADO_ET_ADOURL                   "DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL"
 #define HID_PAGE_DBWIZARD_ADO_PB_ADOURL                   "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL"
-#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION        "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION"
 
 #define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE    "DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE"
 #define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE    "DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE"
@@ -347,7 +256,6 @@
 
 #define HID_DLG_DATABASE_WIZARD                           "DBACCESS_HID_DLG_DATABASE_WIZARD"
 
-#define HID_EXTENSION_NOT_PRESENT_DLG                     "DBACCESS_HID_EXTENSION_NOT_PRESENT_DLG"
 #define HID_MACRO_MIGRATION_BACKUP_LOCATION               "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION"
 
 #endif // _DBA_DBACCESS_HELPID_HRC_
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index c1b7fe3678c2..f5d6fe666d42 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -24,7 +24,7 @@
 
 #define SID_INDEXDESIGN                 ( SID_DBACCESS_START +   0 )
 #define SID_DOCUMENT_DATA_SOURCE        ( SID_DBACCESS_START +   1 )
-#define SID_DB_NEW                      ( SID_DBACCESS_START +   2 )
+// free
 #define SID_DB_APP_DISABLE_PREVIEW      ( SID_DBACCESS_START +   3 )
 #define SID_DB_APP_DSCONNECTION_TYPE    ( SID_DBACCESS_START +   4 )
 #define SID_DB_APP_DSADVANCED_SETTINGS  ( SID_DBACCESS_START +   5 )
@@ -38,7 +38,7 @@
 #define SID_DB_APP_DSRELDESIGN          ( SID_DBACCESS_START +  13 )
 #define SID_DB_APP_DSUSERADMIN          ( SID_DBACCESS_START +  14 )
 #define SID_DB_APP_TABLEFILTER          ( SID_DBACCESS_START +  15 )
-#define SID_DB_APP_CLOSECONNECTION      ( SID_DBACCESS_START +  16 )
+// free
 #define SID_DB_APP_DSPROPS              ( SID_DBACCESS_START +  17 )
 #define SID_DB_APP_DBADMIN              ( SID_DBACCESS_START +  18 )
 #define SID_APP_NEW_REPORT_PRE_SEL      ( SID_DBACCESS_START +  19 )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc
index 131f569565f2..59771087dd8d 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hrc
+++ b/dbaccess/source/ui/dlg/UserAdmin.hrc
@@ -23,8 +23,6 @@
 
 #define LB_USER             1
 
-#define NF_TIMEOUT          1
-
 #define FL_TABLE_GRANTS     1
 #define FL_USER             2
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index df3270053c74..e8da953eefdd 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -23,12 +23,8 @@
 
 // control ids
 
-    // FREE
-    // FREE
 #define FT_USERNAME             3
-#define FT_PASSWORD             4
 #define FT_OPTIONS              5
-    // FREE
 #define FT_JDBCDRIVERCLASS      7
 #define FT_SPECIAL_MESSAGE      8
 #define FT_HOSTNAME             10
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 04154606c296..e14e55eb5b54 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -92,13 +92,9 @@
 
 #define RB_CONNECTVIAODBC           1
 #define RB_CONNECTVIAJDBC           2
-#define RB_REGISTERDATASOURCE       3
-#define RB_DONTREGISTERDATASOURCE   4
 #define RB_CONNECTVIANATIVE         5
 
 #define CB_WIZ_USESSL                       1
-#define CB_STARTTABLEWIZARD                 2
-#define CB_OPENAFTERWARDS                   3
 #define CB_SPREADSHEETPASSWORDREQUIRED      4
 #define CB_GENERALPASSWORDREQUIRED          5
 
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index be453354181b..13cd58e9f43e 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -26,8 +26,6 @@
 #define WIZARD_PAGE_X       225
 #define WIZARD_PAGE_Y       210
 #define START_X             6
-#define START_Y             6
-
 
 #define CHECKBOX_HEIGHT      8
 #define LISTBOX_HEIGHT      12
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 37362731f57c..3cd6f6a95cc8 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -36,24 +36,12 @@
     Text [ en-US ] = "New ~Table Design" ;\
 
 
-#define MID_QUERY_WIZARD    \
-    Identifier = ID_NEW_QUERY_WIZARD;   \
-    HelpId = HID_BROWSER_QUERY_WIZARD ; \
-    Text[ en-US ] = "Query AutoPilot...";   \
-
-
 #define MID_QUERY_NEW_DESIGN    \
     Identifier = ID_NEW_QUERY_DESIGN;   \
     HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \
     Text [ en-US ] = "New ~Query (Design View)" ; \
 
 
-#define MID_QUERY_EDIT_DESIGN   \
-    Identifier = ID_EDIT_QUERY_DESIGN;  \
-    HelpId = HID_BROWSER_QUERY_EDIT ; \
-    Text [ en-US ] = "~Edit Query" ; \
-
-
 #define MID_QUERY_NEW_SQL   \
     Identifier = ID_NEW_QUERY_SQL;  \
     HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \
@@ -77,13 +65,6 @@
     HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
     Text [ en-US ] = "Report Wizard...";    \
 
-
-#define MID_DOCUMENT_NEW_AUTOPILOT                              \
-    Identifier = SID_DB_FORM_NEW_PILOT;                             \
-    HelpID = SID_DB_FORM_NEW_PILOT ;\
-    Text [ en-US ] = "Form AutoPilot...";   \
-
-
 #endif // DBAUI_TOOLBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc
index f7031ba0dfa4..1cceae6fb61e 100644
--- a/dbaccess/source/ui/misc/WizardPages.hrc
+++ b/dbaccess/source/ui/misc/WizardPages.hrc
@@ -33,7 +33,6 @@
 #define PB_HELP                 8
 #define PB_NEXT                 9
 #define PB_PREV                 10
-#define PB_UNDO                 11
 #define IB_COLUMN_UP                    12
 #define IB_COLUMN_DOWN                  13
 #define IB_COLUMN_UP_RIGHT              14
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 08a728b738ca..89aa1b8fdea8 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -24,13 +24,6 @@
 #include "dbaccess_helpid.hrc"
 #include "toolbox.hrc"
 
-#define MN_EDIT 20
-#define MN_VIEW 21
-#define MN_EXTRA 22
-#define MN_INSERT 23
-#define MN_WIN 30
-#define MN_HELP 31
-
 Menu RID_MENU_JOINVIEW_CONNECTION
 {
     ItemList =
@@ -300,10 +293,6 @@ String STR_QUERYDESIGN_NO_VIEW_ASK
     Text [ en-US ] = "Do you want to create a query instead?";
 };
 
-/*
-  The menubar resource has become obsolete - you can now find the menubar definition at: <project>/uiconfig/dbquery/menubar/menubar.xml
- */
-
 String STR_DATASOURCE_DELETED
 {
     Text [ en-US ] = "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved.";
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 0410b0b9ef5e..3a0d7c0c6188 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -24,12 +24,6 @@
 #include <svx/globlmn.hrc>
 #include "toolbox.hrc"
 
-#define MN_EDIT     20
-#define MN_VIEW     21
-#define MN_EXTRA    22
-#define MN_WIN      30
-#define MN_HELP     31
-
 String STR_TABLEDESIGN_DBFIELDTYPES
 {
     Text [ en-US ] = "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)";
@@ -372,16 +366,11 @@ String STR_TABLEDESIGN_NO_PRIM_KEY
     Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ;
 };
 
-
 String STR_TABLEDESIGN_TITLE
 {
     Text [ en-US ] = " - %PRODUCTNAME Base: Table Design";
 };
 
-/*
-  The menubar resource has become obsolete - you can now find the menubar definition at: <project>/uiconfig/dbtable/menubar/menubar.xml
-*/
-
 String STR_TABLEDESIGN_ALTER_ERROR
 {
     Text [ en-US ] = "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ;