summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-06-21 11:51:04 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-06-21 11:54:18 +0200
commit5fcecf9b88a0879081d8239cebbc03e30150985a (patch)
tree2eaa65002db4ccb19778e054f9fc40c33312537c /dbaccess
parent47009fbf515dc6e4d4c275e5a3458b4ce2d817d9 (diff)
hrc cleanup: Remove unused defines
All of those defines (should) not be used at any point in the code. False positives may exist, because some macro names are getting generated by some template/macro foo. This is the version which compiled fine for me. Also there are many commented out lines removed. Change-Id: I6394024682e4ab3691eb72707a9363d41ba31df8
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/inc/dbaccess_helpid.hrc2
-rw-r--r--dbaccess/source/ui/app/dbu_app.hrc1
-rw-r--r--dbaccess/source/ui/dlg/AutoControls_tmpl.hrc7
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hrc6
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.hrc9
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.hrc11
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.hrc3
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.hrc1
-rw-r--r--dbaccess/source/ui/inc/dbu_dlg.hrc2
-rw-r--r--dbaccess/source/ui/inc/dbu_qry.hrc2
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc24
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hrc30
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.hrc1
13 files changed, 0 insertions, 99 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index b3d97a03cec7..aac74fff2c3d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -261,8 +261,6 @@
#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_USER_LDAP "DBACCESS_HID_DSADMIN_USER_LDAP"
-#define HID_DSADMIN_PWDREC_LDAP "DBACCESS_HID_DSADMIN_PWDREC_LDAP"
#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP"
#define HID_BROWSER_QUERY_WIZARD "DBACCESS_HID_BROWSER_QUERY_WIZARD"
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
index d07b88563691..1fcf3c638560 100644
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ b/dbaccess/source/ui/app/dbu_app.hrc
@@ -22,7 +22,6 @@
#include "dbu_resource.hrc"
#endif
-#define TBI_SWITCH_PREVIEW RID_DBACCESS_START
#define RID_STR_NEW_FORM RID_STR_APP_START
#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index c4905ae5ac1b..e6f720f588a1 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -16,7 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _DBAUI_AUTOCONTROLS_HRC_
#define _DBAUI_AUTOCONTROLS_HRC_
@@ -432,9 +431,6 @@
};
-#define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT)
-#define BROWSECONTROLGROUP_HEIGHT ( FIXEDTEXT_HEIGHT + 2 + BUTTON_HEIGHT)
-
// --------------------------------------------------------------------------------------------------
#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \
@@ -444,9 +440,6 @@
// --------------------------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------------------------
-
#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \
\
FixedText FT_AUTOJDBCDRIVERCLASS \
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc
index 49484b09f1f6..c0013365a4a0 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hrc
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc
@@ -24,16 +24,10 @@
#define FT_USERNAME 1
#define FT_JDBCDRIVERCLASS 2
-#define FT_DBASE_PATH_OR_FILE 3
-#define FT_NAME_OF_ODBC_DATASOURCE 4
#define FT_MYSQL_DATABASE_NAME 5
-#define FT_MSACCESS_MDB_FILE 6
-#define FT_FLAT_PATH_OR_FILE 7
-#define FT_CALC_PATH_OR_FILE 8
// FREE
#define FT_NO_ADDITIONAL_SETTINGS 10
#define FT_HOSTNAME 11
-#define FT_ORACLE_DATABASE_NAME 12
#define ET_USERNAME 1
#define ET_JDBCDRIVERCLASS 2
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index 43781afb2249..e23142b6104e 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -84,19 +84,10 @@
#define STR_PAGETITLE_GENERAL 1
#define STR_PAGETITLE_CONNECTION 2
#define STR_PAGETITLE_ADVANCED 3
-#define STR_NO_WILDCARDS 4
#define STR_MYSQLENTRY 5
#define STR_PARENTTITLE 6
#define STR_COULDNOTLOAD_ODBCLIB 7
#define STR_UNSUPPORTED_DATASOURCE_TYPE 8
-#define STR_MYSQL_CONFIG_NEXT_PAGE 9
-#define STR_JDBC_DEFAULT_URL 10
-
-//========================================================================
-// menu item ids
-#define MID_NEW_DATASOURCE 1
-#define MID_DELETE_DATASOURCE 2
-#define MID_RESTORE_DATASOURCE 3
#endif // _DBAUI_DBADMIN_HRC_
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 500f693022fb..1f0b01c89286 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -41,8 +41,6 @@
#define STR_MYSQLJDBC_HELPTEXT 35
#define STR_SPREADSHEET_HELPTEXT 36
// FREE
-#define STR_FINAL_HELPTEXT 38
- // FREE
#define STR_ORACLE_HELPTEXT 40
#define STR_DBASE_HEADERTEXT 41
#define STR_MSACCESS_HEADERTEXT 42
@@ -54,19 +52,12 @@
#define STR_MYSQLJDBC_HEADERTEXT 48
// FREE
#define STR_SPREADSHEET_HEADERTEXT 50
-#define STR_FINAL_HEADERTEXT 52
// FREE
#define STR_ORACLE_HEADERTEXT 54
-#define STR_GENERAL_HEADERTEXT 55
#define STR_DBWIZARDTITLE 56
-#define STR_DEFAULTLDAPPORTNUMBER 60
-
// FREE
-#define STR_ODBCDATASOURCENAME 63
#define STR_SPREADSHEETPATH 64
-#define STR_DBLOCATIONLABEL 65
-#define STR_ADMIN_HELPTEXT 66
#define STR_ORACLE_DEFAULT 67
#define STR_PAGETITLE_INTROPAGE 69
@@ -90,12 +81,10 @@
#define STR_PAGETITLE_MYSQL_NATIVE 87
-#define FT_PORTNUMBERDEFAULT 1
#define FT_LDAP_HELPTEXT 2
#define FT_MYSQL_HELPTEXT 3
#define FT_MYSQL_HEADERTEXT 4
#define FT_MYSQLCONNECTIONMODE 5
-#define FT_BROWSEURL 6
#define FT_AUTHENTIFICATIONHELPTEXT 7
#define FT_AUTHENTIFICATIONHEADERTEXT 8
#define FT_LDAP_HEADERTEXT 9
diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc
index 33e93a144828..be32311455d5 100644
--- a/dbaccess/source/ui/dlg/paramdialog.hrc
+++ b/dbaccess/source/ui/dlg/paramdialog.hrc
@@ -23,12 +23,9 @@
#define FL_PARAMS 2
#define FT_VALUE 3
#define ET_PARAM 4
-#define CB_NULLVAL 5
#define BT_TRAVELNEXT 6
#define BT_OK 7
#define BT_CANCEL 8
-#define AB_PREV 9
-#define AB_NEXT 10
#define STR_COULD_NOT_CONVERT_PARAM 1
diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc
index 2c04152104ad..d183c39e8a25 100644
--- a/dbaccess/source/ui/dlg/queryfilter.hrc
+++ b/dbaccess/source/ui/dlg/queryfilter.hrc
@@ -43,7 +43,6 @@
#define ET_WHEREVALUE3 3
#define STR_NOENTRY 1
-#define STR_NOENTRY2 2
#define STR_DEFAULT 3
#define STR_COMPARE_OPERATORS 4
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 7e4091dd4436..8b9287736636 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -43,7 +43,6 @@
#define INIT_Y 28
#define INDENTED_X 6
#define INDENT_BELOW_RADIO 10
-#define INDENT_BELOW_CHECK 10
// FREE
@@ -110,7 +109,6 @@
#define STR_EXCEPTION_INFO RID_STR_DLG_START + 64
#define STR_EXCEPTION_DETAILS RID_STR_DLG_START + 65
#define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66
-#define STR_MSACCESS_ACCDB_FILE RID_STR_DLG_START + 67
// please adjust checking before insert new strings
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc
index 1c1fb3e6973f..9686f8ab8a02 100644
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ b/dbaccess/source/ui/inc/dbu_qry.hrc
@@ -23,8 +23,6 @@
#endif
-#define STR_QRY_FUNCTIONS RID_STR_QRY_START
-#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1
#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2
#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3
#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 41da16e62a42..6364b2328587 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -79,7 +79,6 @@
#define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0
#define DLG_DBASE_INDEXES RID_DIALOG_START + 1
-#define DLG_SQLMESSAGE RID_DIALOG_START + 2
#define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3
#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4
#define DLG_PARAMETERS RID_DIALOG_START + 5
@@ -119,7 +118,6 @@
// FREE
#define PAGE_CONNECTION RID_PAGE_START + 6
#define PAGE_ADO RID_PAGE_START + 7
-#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8
#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9
#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10
#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11
@@ -139,17 +137,14 @@
#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28
// FREE
#define PAGE_MOZILLA RID_PAGE_START + 32
-#define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33
-#define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40
#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41
#define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42
#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43
#define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44
// FREE
#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46
-#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47
#define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48
#define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49
#define PAGE_DBWIZARD_ADO RID_PAGE_START + 50
@@ -164,8 +159,6 @@
//========================================================================
// error boxes
-#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0
-// free
#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4
@@ -175,7 +168,6 @@
#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9
#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10
-#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11
@@ -212,8 +204,6 @@
// free
#define IMG_PKEYICON RID_IMAGE_START + 12
// free
-#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15
-// free
#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24
#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39
#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40
@@ -232,19 +222,13 @@
#define IMG_JOINS RID_IMAGELIST_START + 0
#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1
#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3
-#define IMP_FORM_SC RID_IMAGELIST_START + 5
-#define IMP_FORM_LC RID_IMAGELIST_START + 7
-#define IMP_REPORT_SC RID_IMAGELIST_START + 9
-#define IMP_REPORT_LC RID_IMAGELIST_START + 11
//========================================================================
// menus
#define MENU_TABLETREE_POPUP RID_MENU_START + 0
-#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1
#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2
#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3
-#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4
#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5
#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
@@ -314,21 +298,13 @@
#define RSC_CHARSETS RID_UNTYPED_START + 2
#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4
-#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5
-#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7
-#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9
-#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11
-#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13
-#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15
//========================================================================
// various
#define PB_FORMAT RID_MISC_START + 0
-#define FIXED_NO_CONNECTION RID_MISC_START + 1
#define LB_LEFT_TABLE RID_MISC_START + 2
#define LB_RIGHT_TABLE RID_MISC_START + 3
-#define LB_CONTROL RID_MISC_START + 4
#define FL_INVOLVED_TABLES RID_MISC_START + 5
#define FL_INVOLVED_FIELDS RID_MISC_START + 6
diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc
index fb7f8f91c467..7589af52e8cb 100644
--- a/dbaccess/source/ui/inc/sbagrid.hrc
+++ b/dbaccess/source/ui/inc/sbagrid.hrc
@@ -22,20 +22,7 @@
//----------------Menueitems-------------------------------------------------
// Tabelle
#define SBA_WHICHID_START 100
-// Zeilenhoehe
-#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem
-#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem
-#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem
-#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem
-#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem
-#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem
-#define SBA_DEF_POSTURE (SBA_WHICHID_START+137) // SvxPostureItem
-#define SBA_DEF_SHADOWED (SBA_WHICHID_START+138) // SvxShadowedItem
-#define SBA_DEF_CONTOUR (SBA_WHICHID_START+139) // SvxContourItem
-#define SBA_DEF_CROSSEDOUT (SBA_WHICHID_START+140) // SvxCrossedOutItem
-#define SBA_DEF_UNDERLINE (SBA_WHICHID_START+141) // SvxUnderlineItem
-#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem
// Spalten
// Formatierung
@@ -77,22 +64,5 @@
#define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem
// Spalte ausblenden
#define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem
-// Kommentar zum Feld
-#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem
-// default wert
-#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem
-// Primrschluessel
-#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem
-// table properties
-#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString
-#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString
-#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString
-#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool
-#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool
-// the col has a default width ?
-#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool
-#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool
-
-
#endif // DBACCESS_SBA_GRID_HRC
diff --git a/dbaccess/source/ui/querydesign/querydlg.hrc b/dbaccess/source/ui/querydesign/querydlg.hrc
index 110655b2749c..b0ad67932fb4 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hrc
+++ b/dbaccess/source/ui/querydesign/querydlg.hrc
@@ -28,7 +28,6 @@
#define LB_JOINTYPE 1
-#define GB_FIELDS 1
#define CB_NATURAL 1