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>

8 files changed, 0 insertions, 54 deletions

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?" ;