[Libreoffice-commits] .: Branch 'integration/dev300_m98' - dbaccess/inc dbaccess/source

Michael Meeks mmeeks at kemper.freedesktop.org
Fri Mar 4 13:09:52 PST 2011


 dbaccess/inc/dbaccess_helpid.hrc       |  872 ++++++++++++++++-----------------
 dbaccess/source/ui/misc/WNameMatch.cxx |    6 
 2 files changed, 434 insertions(+), 444 deletions(-)

New commits:
commit fb2038e67257fb410f96bfa0ef6302275696c688
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Mar 4 21:07:09 2011 +0000

    fix misc merge issues

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 0dcf6d6..e911821 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -28,448 +28,438 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #define _DBA_DBACCESS_HELPID_HRC_
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>	// HID_DBACCESS_START
-#endif
-
-#define HID_DSADMIN_CHARSET							(HID_DBACCESS_START +  9)
-
-#define HID_DLG_FILTERCRIT							(HID_DBACCESS_START + 15)
-#define HID_DLG_ORDERCRIT							(HID_DBACCESS_START + 16)
-
-#define HID_DATABROWSE_HEADER						(HID_DBACCESS_START + 17)
-#define HID_CTL_TABBROWSER							(HID_DBACCESS_START + 18)
-#define UID_DATABROWSE_DATAWINDOW					(HID_DBACCESS_START + 19)
-#define HID_CTL_TREEVIEW							(HID_DBACCESS_START + 20)
-#define UID_CTL_CONTENT								(HID_DBACCESS_START + 21)
-#define HID_TLB_TABBROWSER							(HID_DBACCESS_START + 22)
-#define HID_TLB_TREELISTBOX							(HID_DBACCESS_START + 23)
-#define HID_DSADMIN_DIALOG							(HID_DBACCESS_START + 24)
-
-
-#define HID_DSADMIN_TABCONTROL						(HID_DBACCESS_START + 27)
-#define HID_DSADMIN_PAGE_GENERAL					(HID_DBACCESS_START + 28)
-#define HID_DSADMIN_PAGE_DBASE						(HID_DBACCESS_START + 29)
-#define HID_DSADMIN_PAGE_JDBC						(HID_DBACCESS_START + 30)
-#define HID_DSADMIN_PAGE_ODBC						(HID_DBACCESS_START + 31)
-#define HID_DSADMIN_PAGE_ADABAS						(HID_DBACCESS_START + 32)
-#define HID_DSADMIN_PAGE_TEXT						(HID_DBACCESS_START + 33)
-#define HID_DSADMIN_TABLE_SUBSCRIPTION				(HID_DBACCESS_START + 34)
-#define HID_DSADMIN_DSACTIONS_NEWDS					(HID_DBACCESS_START + 35)
-#define HID_DSADMIN_DSACTIONS_DELETEDS				(HID_DBACCESS_START + 36)
-#define HID_DSADMIN_DSACTIONS_RESTOREDS				(HID_DBACCESS_START + 37)
-#define HID_DSADMIN_DSNAME							(HID_DBACCESS_START + 38)
-#define HID_DSADMIN_DSTYPE							(HID_DBACCESS_START + 39)
-#define HID_DSADMIN_URL_GENERAL						(HID_DBACCESS_START + 40)
-#define HID_DSADMIN_BROWSECONN						(HID_DBACCESS_START + 41)
-#define HID_DSADMIN_LOGINTIMEOUT_NUMBER				(HID_DBACCESS_START + 42)
-#define HID_DSADMIN_LOGINTIMEOUT_UNIT				(HID_DBACCESS_START + 43)
-#define HID_DSADMIN_SHOWDELETED						(HID_DBACCESS_START + 44)
-#define HID_DSADMIN_ALLOWLONG						(HID_DBACCESS_START + 45)
-#define HID_DSADMIN_DBASE_INDICIES					(HID_DBACCESS_START + 46)
-#define HID_DSADMIN_DRIVERCLASS						(HID_DBACCESS_START + 47)
-#define HID_DSADMIN_ODBC_OPTIONS					(HID_DBACCESS_START + 48)
-#define HID_DSADMIN_TEXT_HEADER						(HID_DBACCESS_START + 49)
-#define HID_DSADMIN_FIELD_SEPARATOR					(HID_DBACCESS_START + 50)
-#define HID_DSADMIN_TEXT_SEPARATOR					(HID_DBACCESS_START + 51)
-#define HID_DSADMIN_DECIMAL_SEPARATOR				(HID_DBACCESS_START + 52)
-#define HID_DSADMIN_THOUSANDS_SEPARATOR				(HID_DBACCESS_START + 53)
-#define HID_DSADMIN_EXTENSION						(HID_DBACCESS_START + 54)
-#define HID_DSADMIN_ALL_TABLES						(HID_DBACCESS_START + 55)
-#define HID_DSADMIN_NO_TABLES						(HID_DBACCESS_START + 56)
-#define HID_DSADMIN_SELECT_TABLES					(HID_DBACCESS_START + 57)
-#define HID_DSADMIN_TABLE_SELECTOR					(HID_DBACCESS_START + 58)
-#define HID_DSADMIN_SUPPRESS_VERSIONCL				(HID_DBACCESS_START + 59)
-
-#define	HID_GENERIC_SQL_ERROR						(HID_DBACCESS_START + 60)
-
-#define HID_BROWSER_COLUMNFORMAT					(HID_DBACCESS_START + 61)
-#define HID_BROWSER_COLUMNWIDTH						(HID_DBACCESS_START + 62)
-#define HID_BROWSER_TABLEFORMAT						(HID_DBACCESS_START + 63)
-#define HID_BROWSER_ROWHEIGHT						(HID_DBACCESS_START + 64)
-#define HID_BROWSER_EDIT_DATABASE                   (HID_DBACCESS_START + 65)
-#define HID_BROWSER_CLOSECONN						(HID_DBACCESS_START + 66)
-#define HID_BROWSER_REFRESHCONN						(HID_DBACCESS_START + 67)
-
-#define	HID_DLG_ROWHEIGHT							(HID_DBACCESS_START + 68)
-#define	HID_DLG_COLWIDTH							(HID_DBACCESS_START + 69)
-
-
-#define	HID_TLB_QUERYDESIGN							(HID_DBACCESS_START + 70)
-#define	HID_CTL_QRYSQLEDIT							(HID_DBACCESS_START + 71)
-#define	HID_DSADMIN_SPECIAL_MESSAGE					(HID_DBACCESS_START + 72)
-
-#define	HID_BROWSER_QUERY_CREATE_TEXT				(HID_DBACCESS_START + 73)
-
-#define HID_DLG_ERROR								(HID_DBACCESS_START + 74)
-#define HID_DLG_TEXT								(HID_DBACCESS_START + 75)
-#define UID_SQLERROR_BUTTONMORE						(HID_DBACCESS_START + 76)
-#define HID_DLG_SAVE_AS								(HID_DBACCESS_START + 77)
-
-#define HID_BROWSER_QUERY_EDIT						(HID_DBACCESS_START + 78)
-#define HID_BROWSER_QUERY_DELETE					(HID_DBACCESS_START + 79)
-
-#define	HID_DSADMIN_USER_ADO						(HID_DBACCESS_START + 80)
-#define	HID_DSADMIN_PWDREC_ADO						(HID_DBACCESS_START + 81)
-#define	HID_DSADMIN_CONNURL_ADOPAGE					(HID_DBACCESS_START + 82)
-#define	HID_DSADMIN_PAGE_ADO						(HID_DBACCESS_START + 83)
-
-
-#define	HID_JOINSH_ADDTAB_CLOSE						(HID_DBACCESS_START + 84)
-#define	HID_JOINSH_ADDTAB_TABLELIST					(HID_DBACCESS_START + 85)
-#define	HID_CTL_QRYDGNTAB							(HID_DBACCESS_START + 86)
-#define	HID_DLG_QRY_JOIN							(HID_DBACCESS_START + 87)
-#define	HID_DLG_QRY_JOINTYPE						(HID_DBACCESS_START + 88)
-#define	HID_JOINSH_ADDTAB_QUERYLIST                 (HID_DBACCESS_START + 89)
-#define	HID_DLG_QRY_HELPTEXT						(HID_DBACCESS_START + 92)
-
-#define	HID_CTL_QRYDGNCRIT							(HID_DBACCESS_START + 93)
-#define	HID_QRYDGN_ROW_VISIBLE						(HID_DBACCESS_START + 94)
-#define	HID_QRYDGN_ROW_TABLE						(HID_DBACCESS_START + 95)
-#define	HID_QRYDGN_ROW_FIELD						(HID_DBACCESS_START + 96)
-#define	HID_QRYDGN_ROW_ORDER						(HID_DBACCESS_START + 97)
-#define	HID_QRYDGN_ROW_FUNCTION						(HID_DBACCESS_START + 98)
-#define	HID_QRYDGN_ROW_ALIAS						(HID_DBACCESS_START + 99)
-#define	HID_QRYDGN_ROW_CRIT							(HID_DBACCESS_START + 100)
-
-#define	HID_QUERY_FUNCTION							(HID_DBACCESS_START + 101)
-#define	HID_QUERY_TABLENAME							(HID_DBACCESS_START + 102)
-#define	HID_QUERY_ALIASNAME							(HID_DBACCESS_START + 103)
-#define	HID_QUERY_DISTINCT							(HID_DBACCESS_START + 104)
-
-#define	HID_BROWSER_QUERY_CREATE_DESIGN				(HID_DBACCESS_START + 105)
-
-#define	HID_DSADMIN_QUERIES							(HID_DBACCESS_START + 106)
-#define	HID_DSADMIN_QUERIES_NEW						(HID_DBACCESS_START + 107)
-#define	HID_DSADMIN_QUERIES_EDIT					(HID_DBACCESS_START + 108)
-#define	HID_DSADMIN_QUERIES_DELETE					(HID_DBACCESS_START + 109)
-#define	HID_DSADMIN_QUERYADMINISTRATION				(HID_DBACCESS_START + 110)
-
-
-#define	HID_TAB_DESIGN_TABLE_DESC					(HID_DBACCESS_START + 111)
-#define	HID_TAB_DESIGN_FIELDCONTROL					(HID_DBACCESS_START + 112)
-#define	HID_TABLE_DESIGN_HELP_WINDOW				(HID_DBACCESS_START + 113)
-#define	HID_TAB_DESIGN_DESCWIN						(HID_DBACCESS_START + 114)
-#define	HID_TAB_DESIGN_TABLE_PROPS					(HID_DBACCESS_START + 115)
-#define	HID_TABDESIGN_BACKGROUND					(HID_DBACCESS_START + 116)
-#define	HID_CTL_TABLEEDIT							(HID_DBACCESS_START + 117)
-#define	HID_TABDESIGN_NAMECELL						(HID_DBACCESS_START + 118)
-#define	HID_TABDESIGN_TYPECELL						(HID_DBACCESS_START + 119)
-#define	HID_TABDESIGN_COMMENTCELL					(HID_DBACCESS_START + 120)
-#define	SID_TABLEDESIGN_INSERTROWS					(HID_DBACCESS_START + 121)
-#define	SID_TABLEDESIGN_TABED_PRIMARYKEY			(HID_DBACCESS_START + 122)
-#define	HID_TLB_TABLEDESIGN							(HID_DBACCESS_START + 123)
-#define	HID_TAB_DESIGN_HELP_TEXT_FRAME				(HID_DBACCESS_START + 124)
-#define	HID_TABLE_DESIGN_TABPAGE_GENERAL			(HID_DBACCESS_START + 125)
-#define	HID_TAB_ENT_DEFAULT							(HID_DBACCESS_START + 126)
-#define	HID_TAB_ENT_FORMAT_SAMPLE					(HID_DBACCESS_START + 127)
-#define	HID_TAB_ENT_FORMAT							(HID_DBACCESS_START + 128)
-#define	HID_TAB_ENT_BOOL_DEFAULT					(HID_DBACCESS_START + 129)
-#define	HID_TAB_ENT_REQUIRED						(HID_DBACCESS_START + 130)
-#define	HID_TAB_ENT_AUTOINCREMENT					(HID_DBACCESS_START + 131)
-#define	HID_TAB_ENT_TEXT_LEN						(HID_DBACCESS_START + 132)
-#define	HID_TAB_ENT_TYPE							(HID_DBACCESS_START + 133)
-#define	HID_TAB_ENT_COLUMNNAME						(HID_DBACCESS_START + 134)
-#define	HID_TAB_ENT_NUMTYP							(HID_DBACCESS_START + 135)
-#define	HID_TAB_ENT_LEN								(HID_DBACCESS_START + 136)
-#define	HID_TAB_ENT_SCALE							(HID_DBACCESS_START + 137)
-#define	HID_BROWSER_TABLE_CREATE_DESIGN				(HID_DBACCESS_START + 138)
-#define	HID_BROWSER_TABLE_EDIT						(HID_DBACCESS_START + 139)
-#define	HID_BROWSER_TABLE_DELETE					(HID_DBACCESS_START + 140)
-#define HID_SQLERROR_EXCHAIN_ERRORS					(HID_DBACCESS_START + 141)
-#define HID_SQLERROR_EXCHAIN_TEXT					(HID_DBACCESS_START + 142)
-#define HID_TAB_WIZ_COLUMN_SELECT					(HID_DBACCESS_START + 146)
-#define HID_TAB_WIZ_TYPE_SELECT						(HID_DBACCESS_START + 147)
-#define HID_TAB_NAMEMATCHING_COLS_AVAIL				(HID_DBACCESS_START + 148)
-#define HID_TAB_NAMEMATCHING_COLS_ASSIGN			(HID_DBACCESS_START + 149)
-#define HID_TAB_WIZ_COPYTABLE						(HID_DBACCESS_START + 150)
-#define HID_TAB_WIZ_TABLENAME_EDIT					(HID_DBACCESS_START + 151)
-#define HID_CTL_RELATIONTAB							(HID_DBACCESS_START + 152)
-#define HID_TLB_RELATIONDESIGN 						(HID_DBACCESS_START + 153)
-#define HID_RELATIONDIALOG_LEFTFIELDCELL			(HID_DBACCESS_START + 154)
-#define HID_RELATIONDIALOG_RIGHTFIELDCELL			(HID_DBACCESS_START + 155)
-#define HID_RELDLG_KEYFIELDS						(HID_DBACCESS_START + 156)
-#define HID_BROWSER_RELATION_DESIGN					(HID_DBACCESS_START + 157)
-#define HID_TABLE_DESIGN_NO_CONNECTION				(HID_DBACCESS_START + 158)
-#define HID_DSADMIN_CREATEDATABASE					(HID_DBACCESS_START + 159)
-#define HID_BROWSER_COLUMNINFO						(HID_DBACCESS_START + 160)
-#define HID_DSADMIN_USECATALOG						(HID_DBACCESS_START + 161)
-#define HID_BROWSER_VIEW_CREATE_DESIGN				(HID_DBACCESS_START + 162)
-#define HID_DSADMIN_DOCUMENTS						(HID_DBACCESS_START + 166)
-#define HID_DSADMIN_DOCUMENTLINKS					(HID_DBACCESS_START + 167)
-#define HID_DSADMIN_FILTER_EXPLANATION				(HID_DBACCESS_START + 168)
-#define HID_CONFIRM_DROP_BUTTON_ALL					(HID_DBACCESS_START + 169)
-#define HID_DSBROWSER_BOOKMARK_SELECTED				(HID_DBACCESS_START + 170)
-#define HID_DSADMIN_TABLE_TOOLBOX					(HID_DBACCESS_START + 171)
-#define HID_DSADMIN_QUERY_TOOLBOX					(HID_DBACCESS_START + 172)
-#define HID_DSADMIN_BOOKMARK_TOOLBOX				(HID_DBACCESS_START + 173)
-#define HID_DSADMIN_PAGE_LDAP						(HID_DBACCESS_START + 174)
-#define HID_DSADMIN_LDAP_HOSTNAME					(HID_DBACCESS_START + 175)
-#define HID_DSADMIN_LDAP_BASEDN						(HID_DBACCESS_START + 176)
-#define HID_DSADMIN_LDAP_PORTNUMBER					(HID_DBACCESS_START + 177)
-#define HID_DSBROWSER_BOOKMARKSELECTED				(HID_DBACCESS_START + 178)
-#define HID_DSBROWSER_DISCONNECTING					(HID_DBACCESS_START + 179)
-#define HID_TAB_PAGE_USERADMIN						(HID_DBACCESS_START + 180)
-#define HID_TAB_PAGE_PBUSER							(HID_DBACCESS_START + 181)
-#define HID_TAB_PAGE_PBCHGPWD						(HID_DBACCESS_START + 182)
-#define HID_TAB_PAGE_PBUSERDELETE					(HID_DBACCESS_START + 183)
-#define HID_TAB_PAGE_TBLGRANTS						(HID_DBACCESS_START + 184)
-#define HID_TAB_PAGE_LBUSER							(HID_DBACCESS_START + 185)
-#define HID_DSBROWSER_DIRECTSQL						(HID_DBACCESS_START + 186)
-#define HID_DSADMIN_LDAP_ROWCOUNT					(HID_DBACCESS_START + 187)
-#define HID_BROWSER_QUERY_EDITSQL					(HID_DBACCESS_START + 189)
-#define HID_DSADMIN_PAGE_MOZILLA					(HID_DBACCESS_START + 190)
-#define HID_DSADMIN_MOZILLA_PROFILE_NAME			(HID_DBACCESS_START + 191)
-#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME		(HID_DBACCESS_START + 192)
-#define HID_BROWSER_OPEN_DOCUMENT					(HID_DBACCESS_START + 193)
-#define HID_BROWSER_EDIT_DOCUMENT					(HID_DBACCESS_START + 194)
-#define HID_BROWSER_BEW_DOCUMENT					(HID_DBACCESS_START + 195)
-#define HID_DLG_PASSWORD							(HID_DBACCESS_START + 196)
-
-#define HID_DLGIDX_NEWINDEX							(HID_DBACCESS_START + 197)
-#define HID_DLGIDX_DROPINDEX						(HID_DBACCESS_START + 198)
-#define HID_DLGIDX_RENAMEINDEX						(HID_DBACCESS_START + 199)
-#define HID_DLGIDX_SAVEINDEX						(HID_DBACCESS_START + 200)
-#define HID_DLGIDX_RESETINDEX						(HID_DBACCESS_START + 201)
-#define HID_DLGIDX_INDEXLIST						(HID_DBACCESS_START + 202)
-#define UID_DLGINDEX_INDEXDETAILS_BACK				(HID_DBACCESS_START + 203)
-#define UID_DLGINDEX_INDEXDETAILS_MAIN				(HID_DBACCESS_START + 204)
-#define HID_DLGINDEX_INDEXDETAILS_FIELD				(HID_DBACCESS_START + 205)
-#define HID_DLGINDEX_INDEXDETAILS_SORTORDER			(HID_DBACCESS_START + 206)
-
-#define HID_DOCLINKEDIT_URL							(HID_DBACCESS_START + 207)
-#define HID_QUERY_SQLMODE							(HID_DBACCESS_START + 208)
-
-#define HID_BROWSER_REFRESH_REBUILDVIEW				(HID_DBACCESS_START + 209)
-#define HID_BROWSER_RENAME_ENTRY					(HID_DBACCESS_START + 210)
-
-#define HID_QUERY_EDIT_JOINCONNECTION				(HID_DBACCESS_START + 211)
-
-#define HID_DLG_QRY_WINDOW_CONTROL					(HID_DBACCESS_START + 212)
-#define HID_DLG_QRY_LEFT_TABLE						(HID_DBACCESS_START + 213)
-#define HID_DLG_QRY_RIGHT_TABLE						(HID_DBACCESS_START + 214)
-
-#define HID_DLG_REL_CASC_DEL						(HID_DBACCESS_START + 215)
-#define HID_DLG_REL_NO_CASC_DEL						(HID_DBACCESS_START + 216)
-#define HID_DLG_REL_CASC_DEL_NULL					(HID_DBACCESS_START + 217)
-#define HID_DLG_REL_CASC_DEL_DEFAULT				(HID_DBACCESS_START + 218)
-
-#define HID_DLG_REL_CASC_UPD						(HID_DBACCESS_START + 219)
-#define HID_DLG_REL_NO_CASC_UPD						(HID_DBACCESS_START + 220)
-#define HID_DLG_REL_CASC_UPD_NULL					(HID_DBACCESS_START + 221)
-#define HID_DLG_REL_CASC_UPD_DEFAULT				(HID_DBACCESS_START + 222)
-#define HID_BROWSER_SAVE_RECORD						(HID_DBACCESS_START + 223)
-#define HID_BROWSER_UNDO_RECORD						(HID_DBACCESS_START + 224)
-
-#define HID_DSADMIN_SQL92CHECK						(HID_DBACCESS_START + 225)
-#define HID_DSADMIN_AUTOINCREMENTVALUE				(HID_DBACCESS_START + 226)
-#define HID_DOCUMENT_CREATE_REPWIZ					(HID_DBACCESS_START + 227)
-#define HID_TAB_AUTOINCREMENTVALUE					(HID_DBACCESS_START + 228)
-#define HID_DSADMIN_RETRIEVE_AUTO					(HID_DBACCESS_START + 229)
-#define HID_DSADMIN_AUTORETRIEVEENABLED				(HID_DBACCESS_START + 230)
-
-#define HID_DSADMIN_PAGE_MYSQL_ODBC					(HID_DBACCESS_START + 231)
-#define HID_TAB_PAGE_TABLEPRIVILEGES				(HID_DBACCESS_START + 232)
-
-#define HID_DSADMIN_PAGE_USERDRIVER					(HID_DBACCESS_START + 233)
-#define HID_DSADMIN_USER_DEFINED					(HID_DBACCESS_START + 234)
-#define HID_DSADMIN_USERDEF_OPTIONS					(HID_DBACCESS_START + 235)
-#define HID_DSADMIN_CHARSET_USERDEF					(HID_DBACCESS_START + 236)
-#define HID_DSADMIN_USER_LDAP				        (HID_DBACCESS_START + 237)
-#define HID_DSADMIN_PWDREC_LDAP						(HID_DBACCESS_START + 238)
-#define HID_DSADMIN_USESSL_LDAP						(HID_DBACCESS_START + 239)
-#define HID_BROWSER_QUERY_WIZARD					(HID_DBACCESS_START + 237)
-
-#define HID_DLG_RENAME							    (HID_DBACCESS_START + 237)
-
-#define HID_DSADMIN_PAGE_MYSQL_JDBC					(HID_DBACCESS_START + 238)
-
-#define HID_DSADMIN_DBASE_PATH						(HID_DBACCESS_START + 239)
-#define HID_DSADMIN_MYSQL_DATABASE					(HID_DBACCESS_START + 240)
-#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE			(HID_DBACCESS_START + 241)
-#define HID_DSADMIN_ODBC_DATASOURCE					(HID_DBACCESS_START + 242)
-#define HID_DSADMIN_ADABAS_DATABASE					(HID_DBACCESS_START + 243)
-#define HID_DSADMIN_MSACCESS_MDB_FILE				(HID_DBACCESS_START + 244)
-#define HID_DSADMIN_PAGE_MSACCESS					(HID_DBACCESS_START + 245)
-#define HID_DSADMIN_FLAT_PATH						(HID_DBACCESS_START + 246)
-#define HID_DSADMIN_CALC_PATH						(HID_DBACCESS_START + 247)
-#define HID_DSADMIN_ADVANCED						(HID_DBACCESS_START + 248)
-#define HID_DSADMIN_BOOLEANCOMPARISON				(HID_DBACCESS_START + 249)
-#define HID_DSADMIN_ORACLE_DATABASE					(HID_DBACCESS_START + 250)
-
-#define UID_APP_VIEW							    (HID_DBACCESS_START + 251)
-#define HID_APP_TABLE_TREE						    (HID_DBACCESS_START + 252)
-#define HID_APP_FORM_TREE						    (HID_DBACCESS_START + 253)
-#define HID_APP_QUERY_TREE						    (HID_DBACCESS_START + 254)
-#define HID_APP_REPORT_TREE						    (HID_DBACCESS_START + 255)
-#define UID_APP_DETAIL_VIEW						    (HID_DBACCESS_START + 256)
-#define UID_APP_VIEW_VERT_SPLIT						(HID_DBACCESS_START + 257)
-#define UID_APP_VIEW_BORDER_WIN						(HID_DBACCESS_START + 258)
-#define HID_APP_CREATION_LIST						(HID_DBACCESS_START + 259)
-#define UID_APP_SWAP_VIEW						    (HID_DBACCESS_START + 260)
-#define UID_DLG_TABLE_FILTER						(HID_DBACCESS_START + 261)
-#define HID_APP_SWAP_ICONCONTROL					(HID_DBACCESS_START + 262)
-
-#define HID_DSADMIN_APPENDTABLEALIAS				(HID_DBACCESS_START + 263)
-#define HID_DSADMIN_PARAMETERNAMESUBST				(HID_DBACCESS_START + 264)
-#define HID_DSADMIN_IGNOREDRIVER_PRIV				(HID_DBACCESS_START + 265)
-#define HID_DSADMIN_HOSTNAME						(HID_DBACCESS_START + 266)
-#define HID_DSADMIN_PORTNUMBER						(HID_DBACCESS_START + 267)
-
-#define HID_APP_HELP_TEXT						    (HID_DBACCESS_START + 268)
-#define HID_EXPLORERDLG_COLLECTION					(HID_DBACCESS_START + 269)
-#define UID_APP_DATABASE_VIEW						(HID_DBACCESS_START + 270)
-#define UID_APP_TASKS_VIEW						    (HID_DBACCESS_START + 271)
-#define UID_APP_CONTAINER_VIEW						(HID_DBACCESS_START + 272)
-#define UID_APP_TASKS_WINDOW						(HID_DBACCESS_START + 273)
-#define HID_APP_DESCRIPTION_TEXT					(HID_DBACCESS_START + 274)
-#define UID_APP_DETAILPAGE_HELPER					(HID_DBACCESS_START + 275)
-#define HID_APP_VIEW_PREVIEW_CB						(HID_DBACCESS_START + 276)
-#define HID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 277)
-#define HID_APP_VIEW_PREVIEW_2						(HID_DBACCESS_START + 278)
-#define	HID_TABDESIGN_HELPTEXT						(HID_DBACCESS_START + 279)
-#define UID_APP_VIEW_HORZ_SPLIT						(HID_DBACCESS_START + 280)
-#define UID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 281)
-#define HID_APP_VIEW_PREVIEW_3						(HID_DBACCESS_START + 282)
-
-#define HID_DSADMIN_TYPE_DIALOG						(HID_DBACCESS_START + 283)
-#define HID_DSADMIN_ENABLEOUTERJOIN					(HID_DBACCESS_START + 284)
-#define HID_DSADMIN_ADABASADMIN						(HID_DBACCESS_START + 285)
-#define HID_DSADMIN_USERADMIN						(HID_DBACCESS_START + 286)
-
-#define HID_DBWIZ_PREVIOUS							(HID_DBACCESS_START + 287)
-#define HID_DBWIZ_NEXT								(HID_DBACCESS_START + 288)
-#define HID_DBWIZ_CANCEL							(HID_DBACCESS_START + 289)
-#define HID_DBWIZ_FINISH							(HID_DBACCESS_START + 290)
-#define UID_DBWIZ_HELP								(HID_DBACCESS_START + 291)
-
-#define HID_DSADMIN_CATALOG							(HID_DBACCESS_START + 292)
-#define HID_DSADMIN_SCHEMA							(HID_DBACCESS_START + 293)
-#define HID_DSADMIN_IGNOREINDEXAPPENDIX             (HID_DBACCESS_START + 294)
-#define HID_DSADMIN_DOSLINEENDS						(HID_DBACCESS_START + 295)
-
-#define HID_BROWSER_ADMINISTRATE                    (HID_DBACCESS_START + 296)
-
-#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME      (HID_DBACCESS_START + 297)
-#define HID_DSADMIN_CHECK_REQUIRED_FIELDS           (HID_DBACCESS_START + 298)
-#define HID_DSADMIN_ESCAPE_DATETIME                 (HID_DBACCESS_START + 299)
-
-#define HID_PAGE_DBWIZARD_GENERALPAGE  			                (HID_DBACCESS_START + 300)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE  			(HID_DBACCESS_START + 301)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE  		(HID_DBACCESS_START + 302)
-
-#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION  			    (HID_DBACCESS_START + 304)
-#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION  			    (HID_DBACCESS_START + 305)
-
-
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES  		        (HID_DBACCESS_START + 307)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES  		        (HID_DBACCESS_START + 308)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES 		        (HID_DBACCESS_START + 309)
-#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION  		        (HID_DBACCESS_START + 310)
-
-
-#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 311)
-#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 312)
-#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR  			    (HID_DBACCESS_START + 313)
-#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR  			    (HID_DBACCESS_START + 314)
-#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR  			(HID_DBACCESS_START + 315)
-#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR  			(HID_DBACCESS_START + 316)
-
-#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION  		(HID_DBACCESS_START + 317)
-#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION  		(HID_DBACCESS_START + 318)
-
-#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER  				    (HID_DBACCESS_START + 319)
-#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN  				        (HID_DBACCESS_START + 320)
-#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER  				    (HID_DBACCESS_START + 321)
-#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL  				        (HID_DBACCESS_START + 322)
-#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION  			(HID_DBACCESS_START + 323)
-
-#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME  			    (HID_DBACCESS_START + 326)
-#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME  			    (HID_DBACCESS_START + 327)
-
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC  			    (HID_DBACCESS_START + 329)
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC  			    (HID_DBACCESS_START + 330)
-
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME  			    (HID_DBACCESS_START + 333)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER  			(HID_DBACCESS_START + 334)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT  			    (HID_DBACCESS_START + 335)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS  			    (HID_DBACCESS_START + 336)
-#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS  			(HID_DBACCESS_START + 337)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL  						(HID_DBACCESS_START + 340)
-#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL  						(HID_DBACCESS_START + 341)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS  					(HID_DBACCESS_START + 342)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS  				(HID_DBACCESS_START + 343)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME  					(HID_DBACCESS_START + 344)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER  				(HID_DBACCESS_START + 345)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT  					(HID_DBACCESS_START + 346)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS  					(HID_DBACCESS_START + 347)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS  				(HID_DBACCESS_START + 348)
-
-
-#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL  						(HID_DBACCESS_START + 349)
-#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL  						(HID_DBACCESS_START + 350)
-#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION  			(HID_DBACCESS_START + 351)
-
-#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 355)
-#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 356)
-
-#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH  		(HID_DBACCESS_START + 359)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH  		(HID_DBACCESS_START + 360)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED  	(HID_DBACCESS_START + 361)
-
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED  	(HID_DBACCESS_START + 365)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME  		(HID_DBACCESS_START + 366)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION  		(HID_DBACCESS_START + 367)
-
-#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE		    (HID_DBACCESS_START + 373)
-#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE       (HID_DBACCESS_START + 374)
-#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD  		    (HID_DBACCESS_START + 375)
-#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS  			    (HID_DBACCESS_START + 376)
-
-#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE  				(HID_DBACCESS_START + 377)
-#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE  					(HID_DBACCESS_START + 378)
-#define HID_INDEX_DIALOG_ACTION_TB                              (HID_DBACCESS_START + 379)
-
-#define HID_DLG_DATABASE_WIZARD				  	                (HID_DBACCESS_START + 380)
-
-#define HID_EXTENSION_NOT_PRESENT_DLG		                    ( HID_DBACCESS_START +  381)
-#define HID_DLG_QRY_JOIN_CONTROL    		                    ( HID_DBACCESS_START +  382)
-#define HID_DSADMIN_IGNORECURRENCY  		                    ( HID_DBACCESS_START +  383)
-#define HID_MACRO_MIGRATION_BACKUP_LOCATION                     ( HID_DBACCESS_START +  384)
-#define HID_DSADMIN_PRIMARY_KEY_SUPPORT                         ( HID_DBACCESS_START +  385)
+#define HID_DSADMIN_CHARSET                               "DBACCESS_HID_DSADMIN_CHARSET"
+
+#define HID_DLG_FILTERCRIT                                "DBACCESS_HID_DLG_FILTERCRIT"
+#define HID_DLG_ORDERCRIT                                 "DBACCESS_HID_DLG_ORDERCRIT"
+
+#define HID_DATABROWSE_HEADER                             "DBACCESS_HID_DATABROWSE_HEADER"
+#define HID_CTL_TABBROWSER                                "DBACCESS_HID_CTL_TABBROWSER"
+#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_DIALOG                                "DBACCESS_HID_DSADMIN_DIALOG"
+
+
+#define HID_DSADMIN_TABCONTROL                            "DBACCESS_HID_DSADMIN_TABCONTROL"
+#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_ADABAS                           "DBACCESS_HID_DSADMIN_PAGE_ADABAS"
+#define HID_DSADMIN_PAGE_TEXT                             "DBACCESS_HID_DSADMIN_PAGE_TEXT"
+#define HID_DSADMIN_TABLE_SUBSCRIPTION                    "DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION"
+#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"
+#define HID_DSADMIN_TEXT_HEADER                           "DBACCESS_HID_DSADMIN_TEXT_HEADER"
+#define HID_DSADMIN_FIELD_SEPARATOR                       "DBACCESS_HID_DSADMIN_FIELD_SEPARATOR"
+#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_DSADMIN_TABLE_SELECTOR                        "DBACCESS_HID_DSADMIN_TABLE_SELECTOR"
+#define HID_DSADMIN_SUPPRESS_VERSIONCL                    "DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL"
+
+#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"
+#define HID_BROWSER_TABLEFORMAT                           "DBACCESS_HID_BROWSER_TABLEFORMAT"
+#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_DLG_ROWHEIGHT                                 "DBACCESS_HID_DLG_ROWHEIGHT"
+#define HID_DLG_COLWIDTH                                  "DBACCESS_HID_DLG_COLWIDTH"
+
+
+#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_DLG_SAVE_AS                                   "DBACCESS_HID_DLG_SAVE_AS"
+
+#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_JOINSH_ADDTAB_CLOSE                           "DBACCESS_HID_JOINSH_ADDTAB_CLOSE"
+#define HID_JOINSH_ADDTAB_TABLELIST                       "DBACCESS_HID_JOINSH_ADDTAB_TABLELIST"
+#define HID_CTL_QRYDGNTAB                                 "DBACCESS_HID_CTL_QRYDGNTAB"
+#define HID_DLG_QRY_JOIN                                  "DBACCESS_HID_DLG_QRY_JOIN"
+#define HID_DLG_QRY_JOINTYPE                              "DBACCESS_HID_DLG_QRY_JOINTYPE"
+#define HID_JOINSH_ADDTAB_QUERYLIST                       "DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST"
+#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"
+#define HID_QRYDGN_ROW_FIELD                              "DBACCESS_HID_QRYDGN_ROW_FIELD"
+#define HID_QRYDGN_ROW_ORDER                              "DBACCESS_HID_QRYDGN_ROW_ORDER"
+#define HID_QRYDGN_ROW_FUNCTION                           "DBACCESS_HID_QRYDGN_ROW_FUNCTION"
+#define HID_QRYDGN_ROW_ALIAS                              "DBACCESS_HID_QRYDGN_ROW_ALIAS"
+#define HID_QRYDGN_ROW_CRIT                               "DBACCESS_HID_QRYDGN_ROW_CRIT"
+
+#define HID_QUERY_FUNCTION                                "DBACCESS_HID_QUERY_FUNCTION"
+#define HID_QUERY_TABLENAME                               "DBACCESS_HID_QUERY_TABLENAME"
+#define HID_QUERY_ALIASNAME                               "DBACCESS_HID_QUERY_ALIASNAME"
+#define HID_QUERY_DISTINCT                                "DBACCESS_HID_QUERY_DISTINCT"
+
+#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"
+#define HID_TABDESIGN_TYPECELL                            "DBACCESS_HID_TABDESIGN_TYPECELL"
+#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"
+#define HID_TAB_ENT_FORMAT_SAMPLE                         "DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE"
+#define HID_TAB_ENT_FORMAT                                "DBACCESS_HID_TAB_ENT_FORMAT"
+#define HID_TAB_ENT_BOOL_DEFAULT                          "DBACCESS_HID_TAB_ENT_BOOL_DEFAULT"
+#define HID_TAB_ENT_REQUIRED                              "DBACCESS_HID_TAB_ENT_REQUIRED"
+#define HID_TAB_ENT_AUTOINCREMENT                         "DBACCESS_HID_TAB_ENT_AUTOINCREMENT"
+#define HID_TAB_ENT_TEXT_LEN                              "DBACCESS_HID_TAB_ENT_TEXT_LEN"
+#define HID_TAB_ENT_TYPE                                  "DBACCESS_HID_TAB_ENT_TYPE"
+#define HID_TAB_ENT_COLUMNNAME                            "DBACCESS_HID_TAB_ENT_COLUMNNAME"
+#define HID_TAB_ENT_NUMTYP                                "DBACCESS_HID_TAB_ENT_NUMTYP"
+#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_SQLERROR_EXCHAIN_ERRORS                       "DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS"
+#define HID_SQLERROR_EXCHAIN_TEXT                         "DBACCESS_HID_SQLERROR_EXCHAIN_TEXT"
+#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"
+#define HID_TAB_NAMEMATCHING_COLS_ASSIGN                  "DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN"
+#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_RELDLG_KEYFIELDS                              "DBACCESS_HID_RELDLG_KEYFIELDS"
+#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_DSADMIN_FILTER_EXPLANATION                    "DBACCESS_HID_DSADMIN_FILTER_EXPLANATION"
+#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"
+#define HID_TAB_PAGE_PBCHGPWD                             "DBACCESS_HID_TAB_PAGE_PBCHGPWD"
+#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_DLG_PASSWORD                                  "DBACCESS_HID_DLG_PASSWORD"
+
+#define HID_DLGIDX_NEWINDEX                               "DBACCESS_HID_DLGIDX_NEWINDEX"
+#define HID_DLGIDX_DROPINDEX                              "DBACCESS_HID_DLGIDX_DROPINDEX"
+#define HID_DLGIDX_RENAMEINDEX                            "DBACCESS_HID_DLGIDX_RENAMEINDEX"
+#define HID_DLGIDX_SAVEINDEX                              "DBACCESS_HID_DLGIDX_SAVEINDEX"
+#define HID_DLGIDX_RESETINDEX                             "DBACCESS_HID_DLGIDX_RESETINDEX"
+#define HID_DLGIDX_INDEXLIST                              "DBACCESS_HID_DLGIDX_INDEXLIST"
+#define UID_DLGINDEX_INDEXDETAILS_BACK                    "DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK"
+#define UID_DLGINDEX_INDEXDETAILS_MAIN                    "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN"
+#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_DLG_QRY_WINDOW_CONTROL                        "DBACCESS_HID_DLG_QRY_WINDOW_CONTROL"
+#define HID_DLG_QRY_LEFT_TABLE                            "DBACCESS_HID_DLG_QRY_LEFT_TABLE"
+#define HID_DLG_QRY_RIGHT_TABLE                           "DBACCESS_HID_DLG_QRY_RIGHT_TABLE"
+
+#define HID_DLG_REL_CASC_DEL                              "DBACCESS_HID_DLG_REL_CASC_DEL"
+#define HID_DLG_REL_NO_CASC_DEL                           "DBACCESS_HID_DLG_REL_NO_CASC_DEL"
+#define HID_DLG_REL_CASC_DEL_NULL                         "DBACCESS_HID_DLG_REL_CASC_DEL_NULL"
+#define HID_DLG_REL_CASC_DEL_DEFAULT                      "DBACCESS_HID_DLG_REL_CASC_DEL_DEFAULT"
+
+#define HID_DLG_REL_CASC_UPD                              "DBACCESS_HID_DLG_REL_CASC_UPD"
+#define HID_DLG_REL_NO_CASC_UPD                           "DBACCESS_HID_DLG_REL_NO_CASC_UPD"
+#define HID_DLG_REL_CASC_UPD_NULL                         "DBACCESS_HID_DLG_REL_CASC_UPD_NULL"
+#define HID_DLG_REL_CASC_UPD_DEFAULT                      "DBACCESS_HID_DLG_REL_CASC_UPD_DEFAULT"
+#define HID_BROWSER_SAVE_RECORD                           "DBACCESS_HID_BROWSER_SAVE_RECORD"
+#define HID_BROWSER_UNDO_RECORD                           "DBACCESS_HID_BROWSER_UNDO_RECORD"
+
+#define HID_DSADMIN_SQL92CHECK                            "DBACCESS_HID_DSADMIN_SQL92CHECK"
+#define HID_DSADMIN_AUTOINCREMENTVALUE                    "DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE"
+#define HID_DOCUMENT_CREATE_REPWIZ                        "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
+#define HID_TAB_AUTOINCREMENTVALUE                        "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
+#define HID_DSADMIN_RETRIEVE_AUTO                         "DBACCESS_HID_DSADMIN_RETRIEVE_AUTO"
+#define HID_DSADMIN_AUTORETRIEVEENABLED                   "DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED"
+
+#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_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"
+
+#define HID_DLG_RENAME                                    "DBACCESS_HID_DLG_RENAME"
+
+#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_ADABAS_DATABASE                       "DBACCESS_HID_DSADMIN_ADABAS_DATABASE"
+#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_ADVANCED                              "DBACCESS_HID_DSADMIN_ADVANCED"
+#define HID_DSADMIN_BOOLEANCOMPARISON                     "DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON"
+#define HID_DSADMIN_ORACLE_DATABASE                       "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
+
+#define UID_APP_VIEW                                      "DBACCESS_UID_APP_VIEW"
+#define HID_APP_TABLE_TREE                                "DBACCESS_HID_APP_TABLE_TREE"
+#define HID_APP_FORM_TREE                                 "DBACCESS_HID_APP_FORM_TREE"
+#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"
+#define HID_APP_SWAP_ICONCONTROL                          "DBACCESS_HID_APP_SWAP_ICONCONTROL"
+
+#define HID_DSADMIN_APPENDTABLEALIAS                      "DBACCESS_HID_DSADMIN_APPENDTABLEALIAS"
+#define HID_DSADMIN_PARAMETERNAMESUBST                    "DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST"
+#define HID_DSADMIN_IGNOREDRIVER_PRIV                     "DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV"
+#define HID_DSADMIN_HOSTNAME                              "DBACCESS_HID_DSADMIN_HOSTNAME"
+#define HID_DSADMIN_PORTNUMBER                            "DBACCESS_HID_DSADMIN_PORTNUMBER"
+
+#define HID_APP_HELP_TEXT                                 "DBACCESS_HID_APP_HELP_TEXT"
+#define HID_EXPLORERDLG_COLLECTION                        "DBACCESS_HID_EXPLORERDLG_COLLECTION"
+#define UID_APP_DATABASE_VIEW                             "DBACCESS_UID_APP_DATABASE_VIEW"
+#define UID_APP_TASKS_VIEW                                "DBACCESS_UID_APP_TASKS_VIEW"
+#define UID_APP_CONTAINER_VIEW                            "DBACCESS_UID_APP_CONTAINER_VIEW"
+#define UID_APP_TASKS_WINDOW                              "DBACCESS_UID_APP_TASKS_WINDOW"
+#define HID_APP_DESCRIPTION_TEXT                          "DBACCESS_HID_APP_DESCRIPTION_TEXT"
+#define UID_APP_DETAILPAGE_HELPER                         "DBACCESS_UID_APP_DETAILPAGE_HELPER"
+#define HID_APP_VIEW_PREVIEW_CB                           "DBACCESS_HID_APP_VIEW_PREVIEW_CB"
+#define HID_APP_VIEW_PREVIEW_1                            "DBACCESS_HID_APP_VIEW_PREVIEW_1"
+#define HID_APP_VIEW_PREVIEW_2                            "DBACCESS_HID_APP_VIEW_PREVIEW_2"
+#define	HID_TABDESIGN_HELPTEXT						      "DBACCESS_HID_TABDESIGN_HELPTEXT"
+#define UID_APP_VIEW_HORZ_SPLIT                           "DBACCESS_UID_APP_VIEW_HORZ_SPLIT"
+#define UID_APP_VIEW_PREVIEW_1                            "DBACCESS_UID_APP_VIEW_PREVIEW_1"
+#define HID_APP_VIEW_PREVIEW_3                            "DBACCESS_HID_APP_VIEW_PREVIEW_3"
+
+#define HID_DSADMIN_TYPE_DIALOG                           "DBACCESS_HID_DSADMIN_TYPE_DIALOG"
+#define HID_DSADMIN_ENABLEOUTERJOIN                       "DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN"
+#define HID_DSADMIN_ADABASADMIN                           "DBACCESS_HID_DSADMIN_ADABASADMIN"
+#define HID_DSADMIN_USERADMIN                             "DBACCESS_HID_DSADMIN_USERADMIN"
+
+#define HID_DBWIZ_PREVIOUS                                "DBACCESS_HID_DBWIZ_PREVIOUS"
+#define HID_DBWIZ_NEXT                                    "DBACCESS_HID_DBWIZ_NEXT"
+#define HID_DBWIZ_CANCEL                                  "DBACCESS_HID_DBWIZ_CANCEL"
+#define HID_DBWIZ_FINISH                                  "DBACCESS_HID_DBWIZ_FINISH"
+#define UID_DBWIZ_HELP                                    "DBACCESS_UID_DBWIZ_HELP"
+
+#define HID_DSADMIN_CATALOG                               "DBACCESS_HID_DSADMIN_CATALOG"
+#define HID_DSADMIN_SCHEMA                                "DBACCESS_HID_DSADMIN_SCHEMA"
+#define HID_DSADMIN_IGNOREINDEXAPPENDIX                   "DBACCESS_HID_DSADMIN_IGNOREINDEXAPPENDIX"
+#define HID_DSADMIN_DOSLINEENDS                           "DBACCESS_HID_DSADMIN_DOSLINEENDS"
+
+#define HID_BROWSER_ADMINISTRATE                          "DBACCESS_HID_BROWSER_ADMINISTRATE"
+
+#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME            "DBACCESS_HID_DSADMIN_AS_BEFORE_CORRELATION_NAME"
+#define HID_DSADMIN_CHECK_REQUIRED_FIELDS                 "DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS"
+#define HID_DSADMIN_ESCAPE_DATETIME                       "DBACCESS_HID_DSADMIN_ESCAPE_DATETIME"
+
+#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"
+
+#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER              "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER"
+#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_ADABAS_ET_ADABASNAME            "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME"
+#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME            "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME"
+
+#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"
+
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME          "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME"
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER      "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER"
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT            "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT"
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS           "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS"
+#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS       "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS"
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL                 "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL"
+#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL                 "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL"
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS               "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS"
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS           "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS"
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME             "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME"
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER         "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER"
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT               "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT"
+#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"
+
+#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH  "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH"
+#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH  "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH"
+#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED"
+
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED"
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME"
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION"
+
+#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE     "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE"
+#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE"
+#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD       "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD"
+#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS         "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS"
+
+#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE           "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE"
+#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE              "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE"
+#define HID_INDEX_DIALOG_ACTION_TB                        "DBACCESS_HID_INDEX_DIALOG_ACTION_TB"
+
+#define HID_DLG_DATABASE_WIZARD                           "DBACCESS_HID_DLG_DATABASE_WIZARD"
+
+#define HID_EXTENSION_NOT_PRESENT_DLG                     "DBACCESS_HID_EXTENSION_NOT_PRESENT_DLG"
+#define HID_DLG_QRY_JOIN_CONTROL                          "DBACCESS_HID_DLG_QRY_JOIN_CONTROL"
+#define HID_DSADMIN_IGNORECURRENCY                        "DBACCESS_HID_DSADMIN_IGNORECURRENCY"
+#define HID_MACRO_MIGRATION_BACKUP_LOCATION               "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION"
+#define HID_DSADMIN_PRIMARY_KEY_SUPPORT                   "DBACCESS_HID_DSADMIN_PRIMARY_KEY_SUPPORT"
 
 // this one below have hid in number space HID_SBA_START
-#define HID_DLG_ADABAS_NEWDB						(HID_SBA_START +  0)
-#define HID_DLG_ADABAS_DBNAME						(HID_SBA_START +  1)
-#define HID_DLG_ADABAS_SYSUSR						(HID_SBA_START +  2)
-#define HID_DLG_ADABAS_SYSPWD						(HID_SBA_START +  3)
-#define HID_DLG_ADABAS_CONUSR						(HID_SBA_START +  4)
-#define HID_DLG_ADABAS_CONPWD						(HID_SBA_START +  5)
-#define HID_DLG_ADABAS_DATADEVSPACE_SIZE			(HID_SBA_START +  6)
-#define HID_DLG_ADABAS_CACHE_SIZE					(HID_SBA_START +  7)
-#define HID_DLG_ADABAS_USR							(HID_SBA_START +  8)
-#define HID_DLG_ADABAS_DOMAINPWD					(HID_SBA_START +  9)
-#define HID_DLG_ADABAS_RESTORE						(HID_SBA_START +  10)
-#define HID_DLG_ADABAS_PBRESTORE					(HID_SBA_START +  11)
-#define HID_DLG_ADABAS_SYSDEVSPACE					(HID_SBA_START +  12)
-#define HID_DLG_ADABAS_PBSYSDEVSPACE				(HID_SBA_START +  13)
-#define HID_DLG_ADABAS_TRANSACTIONLOG				(HID_SBA_START +  14)
-#define HID_DLG_ADABAS_PBTRANSACTIONLOG				(HID_SBA_START +  15)
-#define HID_DLG_ADABAS_DATADEVSPACE					(HID_SBA_START +  16)
-#define HID_DLG_ADABAS_PBDATADEVSPACE				(HID_SBA_START +  18)
-#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE			(HID_SBA_START +  19)
-#define HID_DLG_ADABAS_CON_PWD						(HID_SBA_START +  20)
-#define HID_DLG_ADABAS_SYS_PWD						(HID_SBA_START +  21)
-#define HID_DLG_ADABAS_DOMAIN_PWD					(HID_SBA_START +  22)
-//end of HID_SBA_START
-
-// don't forget to update the file util/hidother.src
-
-
+#define HID_DLG_ADABAS_NEWDB                              "DBACCESS_HID_DLG_ADABAS_NEWDB"
+#define HID_DLG_ADABAS_DBNAME                             "DBACCESS_HID_DLG_ADABAS_DBNAME"
+#define HID_DLG_ADABAS_SYSUSR                             "DBACCESS_HID_DLG_ADABAS_SYSUSR"
+#define HID_DLG_ADABAS_SYSPWD                             "DBACCESS_HID_DLG_ADABAS_SYSPWD"
+#define HID_DLG_ADABAS_CONUSR                             "DBACCESS_HID_DLG_ADABAS_CONUSR"
+#define HID_DLG_ADABAS_CONPWD                             "DBACCESS_HID_DLG_ADABAS_CONPWD"
+#define HID_DLG_ADABAS_DATADEVSPACE_SIZE                  "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE"
+#define HID_DLG_ADABAS_CACHE_SIZE                         "DBACCESS_HID_DLG_ADABAS_CACHE_SIZE"
+#define HID_DLG_ADABAS_USR                                "DBACCESS_HID_DLG_ADABAS_USR"
+#define HID_DLG_ADABAS_DOMAINPWD                          "DBACCESS_HID_DLG_ADABAS_DOMAINPWD"
+#define HID_DLG_ADABAS_RESTORE                            "DBACCESS_HID_DLG_ADABAS_RESTORE"
+#define HID_DLG_ADABAS_PBRESTORE                          "DBACCESS_HID_DLG_ADABAS_PBRESTORE"
+#define HID_DLG_ADABAS_SYSDEVSPACE                        "DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE"
+#define HID_DLG_ADABAS_PBSYSDEVSPACE                      "DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE"
+#define HID_DLG_ADABAS_TRANSACTIONLOG                     "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG"
+#define HID_DLG_ADABAS_PBTRANSACTIONLOG                   "DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG"
+#define HID_DLG_ADABAS_DATADEVSPACE                       "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE"
+#define HID_DLG_ADABAS_PBDATADEVSPACE                     "DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE"
+#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE                "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE"
+#define HID_DLG_ADABAS_CON_PWD                            "DBACCESS_HID_DLG_ADABAS_CON_PWD"
+#define HID_DLG_ADABAS_SYS_PWD                            "DBACCESS_HID_DLG_ADABAS_SYS_PWD"
+#define HID_DLG_ADABAS_DOMAIN_PWD                         "DBACCESS_HID_DLG_ADABAS_DOMAIN_PWD"
+
+#define HID_DLG_JOIN_TABADD                               "DBACCESS_HID_DLG_JOIN_TABADD"
 
 #endif // _DBA_DBACCESS_HELPID_HRC_
-
-
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index f60b6ec..dcbc46e 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -73,8 +73,8 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_CTRL_RIGHT.SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl));
     m_CTRL_RIGHT.EnableCheckButton( NULL );
 
-    m_CTRL_LEFT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
-    m_CTRL_RIGHT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
+    m_CTRL_LEFT.SetStyle( m_CTRL_LEFT.GetStyle() | WB_FORCE_MAKEVISIBLE );
+    m_CTRL_RIGHT.SetStyle( m_CTRL_RIGHT.GetStyle() | WB_FORCE_MAKEVISIBLE );
 
     m_sSourceText	= m_FT_TABLE_LEFT.GetText();
     m_sSourceText.AppendAscii("\n");
@@ -366,7 +366,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId )
 {
     SetDragDropMode( 0 );
     EnableInplaceEditing( sal_False );
-    SetWindowBits(WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
+    SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
     SetSelectionMode( SINGLE_SELECTION );
 }
 //------------------------------------------------------------------------


More information about the Libreoffice-commits mailing list