diff options
64 files changed, 818 insertions, 700 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 22d1ceb11368..6bbf59dfc7e4 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -28,446 +28,439 @@ #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_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 (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_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 (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_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 (HID_DBACCESS_START + 380) +#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD" -#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_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/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index c273a67edcbd..96ff91e7d0e8 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -109,6 +109,9 @@ #define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) +#define SID_TABLEDESIGN_TABED_PRIMARYKEY ( SID_DBACCESS_START + 67 ) +#define SID_TABLEDESIGN_INSERTROWS ( SID_DBACCESS_START + 68 ) + #endif // _DBACCESS_SLOTID_HRC_ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index fefeec0125a1..6c47ca6f397f 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -280,7 +280,7 @@ namespace dbaui @param _nHelpId The help id to dispatch. */ - void openHelpAgent(sal_Int32 _nHelpId); + void openHelpAgent( const rtl::OString& _sHelpId ); /** open the help agent for the given help url. @param _pHelpStringURL diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 9742dcdfec71..1039377321d5 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -31,6 +31,7 @@ // ----------------------------------------------------------------------------- ModalDialog DLG_MACRO_MIGRATION { + HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION"; OutputSize = TRUE ; Moveable = TRUE; Closeable = TRUE ; @@ -65,6 +66,7 @@ ModalDialog DLG_MACRO_MIGRATION TabPage TP_PREPARE { + HelpID = "dbaccess:TabPage:TP_PREPARE"; Pos = MAP_APPFONT( 40, 130 ); Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); @@ -115,6 +117,7 @@ TabPage TP_PREPARE TabPage TP_SAVE_DBDOC_AS { + HelpID = "dbaccess:TabPage:TP_SAVE_DBDOC_AS"; Pos = MAP_APPFONT( 40, 130 ); Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); @@ -152,6 +155,7 @@ TabPage TP_SAVE_DBDOC_AS ComboBox ED_SAVE_AS_LOCATION { + HelpID = "dbaccess:ComboBox:TP_SAVE_DBDOC_AS:ED_SAVE_AS_LOCATION"; Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED, CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN, @@ -163,6 +167,7 @@ TabPage TP_SAVE_DBDOC_AS PushButton PB_BROWSE_SAVE_AS_LOCATION { + HelpID = "dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION"; Pos = MAP_APPFONT( TAB_PAGE_WIDTH - BUTTON_WIDTH - TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + INPUT_HEIGHT + SPACING_RELATED ); Size = MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); @@ -189,6 +194,7 @@ TabPage TP_SAVE_DBDOC_AS TabPage TP_MIGRATE { + HelpID = "dbaccess:TabPage:TP_MIGRATE"; Pos = MAP_APPFONT( 40, 130 ); Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); @@ -302,6 +308,7 @@ TabPage TP_MIGRATE TabPage TP_SUMMARY { + HelpID = "dbaccess:TabPage:TP_SUMMARY"; Pos = MAP_APPFONT( 40, 130 ); Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); @@ -325,6 +332,7 @@ TabPage TP_SUMMARY MultiLineEdit ED_CHANGES { + HelpID = "dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES"; Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_HEIGHT - ( CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index afad4e3a2d7c..2a5eb22549b8 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -753,23 +753,24 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed."); - USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0; + USHORT nImageId = 0, nImageIdH = 0; + rtl::OString sHelpId; ImageProvider aImageProvider; Image aFolderImage, aFolderImageHC; switch( _eType ) { case E_FORM: - nHelpId = HID_APP_FORM_TREE; + sHelpId = HID_APP_FORM_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true ); break; case E_REPORT: - nHelpId = HID_APP_REPORT_TREE; + sHelpId = HID_APP_REPORT_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true ); break; case E_QUERY: - nHelpId = HID_APP_QUERY_TREE; + sHelpId = HID_APP_QUERY_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true ); break; @@ -780,7 +781,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA if ( !m_pLists[_eType] ) { - m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC ); + m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC ); } if ( m_pLists[_eType] ) @@ -878,10 +879,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine } } // ----------------------------------------------------------------------------- -DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ) +DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC ) { DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); - pTreeView->SetHelpId(_nHelpId); + pTreeView->SetHelpId( _sHelpId ); return createTree( pTreeView, _rImage, _rImageHC ); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 5ade6b687949..9f3cadc56a44 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -190,7 +190,7 @@ namespace dbaui @return The new tree. */ - DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); + DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC ); DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); DECL_LINK( OnEntrySelChange, void* ); diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..4af2bdb70521 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW MenuItem { Identifier = SID_APP_NEW_FORM; - HelpId = SID_APP_NEW_FORM; Command = ".uno:DBNewForm"; Text [ en-US ] = "Form..." ; }; MenuItem { Identifier = SID_APP_NEW_REPORT; - HelpId = SID_APP_NEW_REPORT; Command = ".uno:DBNewReport"; Text [ en-US ] = "Report..." ; }; @@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW MenuItem { Identifier = SID_DB_NEW_VIEW_SQL; - HelpId = SID_DB_NEW_VIEW_SQL; Command = ".uno:DBNewViewSQL"; Text [ en-US ] = "View (Simple)..." ; }; @@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_PASTE_SPECIAL; - HelpID = SID_DB_APP_PASTE_SPECIAL ; Text[ en-US ] = "Paste Special..."; Command = ".uno:PasteSpecial"; }; @@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_DELETE; - HelpID = SID_DB_APP_DELETE ; Text[ en-US ] = "Delete"; Command = ".uno:DBDelete"; }; MenuItem { Identifier = SID_DB_APP_RENAME; - HelpID = SID_DB_APP_RENAME ; Text[ en-US ] = "Rename"; Command = ".uno:DBRename"; }; MenuItem { Identifier = SID_DB_APP_EDIT; - HelpID = SID_DB_APP_EDIT ; Text[ en-US ] = "Edit"; Command = ".uno:DBEdit"; }; MenuItem { Identifier = SID_DB_APP_EDIT_SQL_VIEW; - HelpID = SID_DB_APP_EDIT_SQL_VIEW ; Text [ en-US ] = "Edit in SQL View..."; Command = ".uno:DBEditSqlView"; }; MenuItem { Identifier = SID_DB_APP_OPEN; - HelpID = SID_DB_APP_OPEN ; Text[ en-US ] = "Open"; Command = ".uno:DBOpen"; }; MenuItem { Identifier = SID_DB_APP_CONVERTTOVIEW; - HelpID = SID_DB_APP_CONVERTTOVIEW ; Text[ en-US ] = "Create as View"; Command = ".uno:DBConvertToView"; }; @@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_APP_NEW_REPORT_PRE_SEL; - HelpId = SID_APP_NEW_REPORT_PRE_SEL; Command = ".uno:DBNewReportWithPreSelection"; Text [ en-US ] = "Report..." ; }; MenuItem { Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ; - HelpID = HID_DOCUMENT_CREATE_REPWIZ ; Text[ en-US ] = "Report Wizard..."; Command = ".uno:DBNewReportAutoPilotWithPreSelection"; @@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_SELECTALL; - HelpID = SID_SELECTALL ; Text[ en-US ] = "Select All"; Command = ".uno:SelectAll"; }; @@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_DSPROPS; - HelpID = SID_DB_APP_DSPROPS ; Text[ en-US ] = "Properties"; Command = ".uno:DBDSProperties"; }; MenuItem { Identifier = SID_DB_APP_DSCONNECTION_TYPE; - HelpID = SID_DB_APP_DSCONNECTION_TYPE ; Text[ en-US ] = "Connection Type"; Command = ".uno:DBDSConnectionType"; }; MenuItem { Identifier = SID_DB_APP_DSADVANCED_SETTINGS; - HelpID = SID_DB_APP_DSADVANCED_SETTINGS ; Text[ en-US ] = "Advanced Settings"; Command = ".uno:DBDSAdvancedSettings"; }; @@ -394,7 +378,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_DISABLE_PREVIEW; - HelpId = SID_DB_APP_DISABLE_PREVIEW; Text[ en-US ] = "None"; Command = ".uno:DBDisablePreview"; Checkable = TRUE; @@ -404,7 +387,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW; - HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW; Text[ en-US ] = "Document Information"; Command = ".uno:DBShowDocInfoPreview"; Checkable = TRUE; @@ -414,7 +396,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_VIEW_DOC_PREVIEW; - HelpId = SID_DB_APP_VIEW_DOC_PREVIEW; Text[ en-US ] = "Document"; Command = ".uno:DBShowDocPreview"; Checkable = TRUE; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 5935baafa2c0..b81b073a56bf 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1387,9 +1387,9 @@ void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL openHelpAgent( aURL ); } -void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId) +void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId) { - openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _nHelpId ) ); + openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) ); } void OGenericUnoController::openHelpAgent( const URL& _rURL ) diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 747a2d7ac8cf..476fcf683b3f 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -190,14 +190,12 @@ Menu RID_MENU_REFRESH_DATA MenuItem { MID_SBA_QRY_REFRESH - HelpId = SID_FM_REFRESH ; Command = ".uno:Refresh"; }; MenuItem { Identifier = ID_BROWSER_REFRESH_REBUILD; Command = ".uno:DBRebuildData"; - HelpId = HID_BROWSER_REFRESH_REBUILDVIEW; Text [ en-US ] = "Rebuild"; }; }; diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index c2c8affcd4a8..c5c2a084b64a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1070,9 +1070,9 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) } } // ----------------------------------------------------------------------------- -void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler) +void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler) { - _pControl->SetHelpId(_nHelpId); + _pControl->SetHelpId(_sHelpId); if ( _bAddChangeHandler ) ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); @@ -1089,7 +1089,7 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes) return pFixedText; } // ----------------------------------------------------------------------------- -OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId) +OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId) { OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); @@ -1097,7 +1097,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig pControl->SetStrictFormat(TRUE); - InitializeControl(pControl,_nHelpId,false); + InitializeControl(pControl,_sHelpId,false); return pControl; } diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 14bbe171c613..ca94faeb56f8 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -338,18 +338,18 @@ namespace dbaui { DBG_CHKTHIS(ORelationControl,NULL); - ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; + rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) { case SOURCE_COLUMN: xDef = m_xSourceDef; - nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; + sHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; break; case DEST_COLUMN: xDef = m_xDestDef; - nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; + sHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; break; default: // ????????? @@ -367,7 +367,7 @@ namespace dbaui m_pListCell->SelectEntry( sName ); } - m_pListCell->SetHelpId(nHelpId); + m_pListCell->SetHelpId(sHelpId); } } diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index ff29ac12383d..37bf187b6c90 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -37,6 +37,7 @@ ModalDialog DLG_ADABASSTAT { + HelpID = "dbaccess:ModalDialog:DLG_ADABASSTAT"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -59,6 +60,7 @@ ModalDialog DLG_ADABASSTAT Edit ET_SYSDEVSPACE { + HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 14 ) ; Size = MAP_APPFONT ( 128 , 12 ) ; @@ -75,6 +77,7 @@ ModalDialog DLG_ADABASSTAT Edit ET_TRANSACTIONLOG { + HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 31 ) ; Size = MAP_APPFONT ( 128 , 12 ) ; @@ -91,6 +94,7 @@ ModalDialog DLG_ADABASSTAT ListBox LB_DATADEVS { + HelpID = "dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 48 ) ; Size = MAP_APPFONT ( 128 , 42 ) ; @@ -115,6 +119,7 @@ ModalDialog DLG_ADABASSTAT Edit ET_SIZE { + HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 109 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; @@ -131,6 +136,7 @@ ModalDialog DLG_ADABASSTAT Edit ET_FREESIZE { + HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 126 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; @@ -147,6 +153,7 @@ ModalDialog DLG_ADABASSTAT NumericField ET_MEMORYUSING { + HelpID = "dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING"; Border = TRUE ; Pos = MAP_APPFONT ( 120 , 144 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 425e713094f3..258eec3a2acf 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -126,7 +126,7 @@ // ------------------------------------------------------------------------------------------------- -#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ +#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2) \ FixedText FT_AUTOBROWSEURL { \ Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ @@ -147,7 +147,7 @@ { \ Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - HelpId = (AUTO_HID + 1); \ + HelpId = AUTO_HID2; \ TabStop = TRUE ; \ Text[ en-US ] = "Browse"; \ }; @@ -214,7 +214,9 @@ // -------------------------------------------------------------------------------------------------- - +// MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the +// AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the +// also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText #define AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOPORTNUMBER \ { \ @@ -235,7 +237,6 @@ \ FixedText FT_AUTOPORTNUMBERDEFAULT \ { \ - HelpId = AUTO_HID + 1 ; \ Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "" ; \ @@ -445,9 +446,9 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ +#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \ AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ - AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID) + AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2) // -------------------------------------------------------------------------------------------------- @@ -455,7 +456,7 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ { \ @@ -479,7 +480,7 @@ Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ Size = MAP_APPFONT (50, 14); \ - HelpId = AUTO_HID + 1; \ + HelpId = AUTO_HID2; \ Text[ en-US ] = "Test class" ; \ }; @@ -502,13 +503,13 @@ }; -#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ +#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ - AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ - AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ + AUTO_HOSTCONTROLGROUP(96, AUTO_HID2) \ + AUTO_PORTCONTROLGROUP(113, AUTO_HID3 ) \ AUTO_SOCKETCONTROLGROUP(129) \ - AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5) // -------------------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index 018893384dab..86ac75a0d9e9 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -64,6 +64,7 @@ ModalDialog DLG_COLLECTION_VIEW }; ImageButton BTN_EXPLORERFILE_NEWFOLDER { + HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER"; TabStop = FALSE ; Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - RELATED_CONTROLS - 2*IMG_SIZE, UNRELATED_CONTROLS ) ; Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ; @@ -71,6 +72,7 @@ ModalDialog DLG_COLLECTION_VIEW }; ImageButton BTN_EXPLORERFILE_UP { + HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP"; TabStop = TRUE ; Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - IMG_SIZE, UNRELATED_CONTROLS ) ; Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_COLLECTION_VIEW }; Edit ED_EXPLORERFILE_FILENAME { + HelpID = "dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME"; Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50 , WIN_Y - 3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT) ; Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS - 2*UNRELATED_CONTROLS - 50 , EDIT_HEIGHT ) ; Border = TRUE ; @@ -107,6 +110,7 @@ ModalDialog DLG_COLLECTION_VIEW PushButton BTN_EXPLORERFILE_SAVE { + HelpID = "dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE"; Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; DefButton = TRUE ; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..33b70033b0f0 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -42,6 +42,7 @@ //......................................................................... TabPage PAGE_CONNECTION { + HelpID = "dbaccess:TabPage:PAGE_CONNECTION"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; @@ -55,7 +56,7 @@ TabPage PAGE_CONNECTION }; - AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL) + AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN) FixedText FT_NO_ADDITIONAL_SETTINGS @@ -91,6 +92,7 @@ TabPage PAGE_CONNECTION }; Edit ET_USERNAME { + HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ; Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; @@ -98,6 +100,7 @@ TabPage PAGE_CONNECTION }; CheckBox CB_PASSWORD_REQUIRED { + HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED"; Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ; Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Password required"; @@ -129,6 +132,7 @@ TabPage PAGE_CONNECTION PushButton PB_TESTDRIVERCLASS { + HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS"; TabStop = TRUE ; Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -2 ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; @@ -137,6 +141,7 @@ TabPage PAGE_CONNECTION PushButton PB_TESTCONNECTION { + HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION"; Pos = MAP_APPFONT ( PAGE_X - 75 - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ; Size = MAP_APPFONT ( 75 , BUTTON_HEIGHT ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index 9507c4256360..e7a36fa8d3f4 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -72,6 +72,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG PushButton PB_DOWNLOAD { + HelpID = "dbaccess:PushButton:RID_EXTENSION_NOT_PRESENT_DLG:PB_DOWNLOAD"; Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; DefButton = TRUE ; diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 68399ca52619..81e183e4b77b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -36,6 +36,7 @@ ModalDialog DLG_REL_PROPERTIES { + HelpID = "dbaccess:ModalDialog:DLG_REL_PROPERTIES"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 186 , 205 ) ; diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 4a12a0dd13ea..352963b21272 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -34,9 +34,6 @@ #ifndef _DBAUI_DBADMINIMPL_HXX_ #include "DbAdminImpl.hxx" #endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ -#include "dbaccess_helpid.hrc" -#endif #ifndef _DBAUI_TABLESPAGE_HXX_ #include "tablespage.hxx" #endif @@ -51,6 +48,8 @@ #include "propertysetitem.hxx" #endif +#include "dbu_dlg.hrc" + //......................................................................... namespace dbaui { @@ -69,7 +68,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent ,SfxItemSet* _pItems ,const Reference< XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName) - :SfxSingleTabDialog(pParent,UID_DLG_TABLE_FILTER,_pItems) + :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems) ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) ) ,m_bStopExecution(sal_False) ,m_pOutSet(_pItems) diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 2cab4f9e89f0..8d88dcf8f1ce 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -159,6 +159,7 @@ ModalDialog DLG_PASSWORD }; Edit ED_OLDPASSWORD { + HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ; Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; @@ -173,6 +174,7 @@ ModalDialog DLG_PASSWORD }; Edit ED_PASSWORD { + HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 34 ) ; Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; @@ -186,6 +188,7 @@ ModalDialog DLG_PASSWORD }; Edit ED_PASSWORD_REPEAT { + HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 51 ) ; Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..7a36bddb378f 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -38,7 +38,7 @@ ModelessDialog DLG_JOIN_TABADD { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = DLG_JOIN_TABADD ; + HelpID = HID_DLG_JOIN_TABADD ; Size = MAP_APPFONT ( 178 , 147 ) ; Moveable = TRUE ; Closeable = TRUE ; @@ -46,6 +46,7 @@ ModelessDialog DLG_JOIN_TABADD RadioButton RB_CASE_TABLES { + HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES"; Pos = MAP_APPFONT( 6, 6 ); Size = MAP_APPFONT( 50, 8 ); Text [ en-US ] = "Tables"; @@ -53,6 +54,7 @@ ModelessDialog DLG_JOIN_TABADD RadioButton RB_CASE_QUERIES { + HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES"; Pos = MAP_APPFONT( 62, 6 ); Size = MAP_APPFONT( 50, 8 ); Text [ en-US ] = "Queries"; @@ -69,6 +71,7 @@ ModelessDialog DLG_JOIN_TABADD }; PushButton PB_ADDTABLE { + HelpID = "dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE"; Pos = MAP_APPFONT ( 123 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src index 4c5a7d924d33..f37c67148e18 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.src +++ b/dbaccess/source/ui/dlg/advancedsettings.src @@ -253,6 +253,7 @@ TabPage PAGE_GENERATED_VALUES { + HelpID = "dbaccess:TabPage:PAGE_GENERATED_VALUES"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; @@ -311,6 +312,7 @@ TabPage PAGE_GENERATED_VALUES TabPage PAGE_ADVANCED_SETTINGS_SPECIAL { + HelpID = "dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index c4457c62eec0..1d8744f07b53 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -196,6 +196,7 @@ TabPage PAGE_GENERAL RadioButton RB_OPENEXISTINGDOC { + HelpID = "dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC"; Pos = MAP_APPFONT (START_X + 6 , 97 ); Size = MAP_APPFONT ( 206 , 8 ) ; Text [ en-US ] = "Open an existing database ~file" ; @@ -210,6 +211,7 @@ TabPage PAGE_GENERAL ListBox LB_DOCUMENTLIST { + HelpID = "dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST"; Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 121 ); Size = MAP_APPFONT( 120, 14 ); DropDown = TRUE; @@ -218,6 +220,7 @@ TabPage PAGE_GENERAL PushButton PB_OPENDOCUMENT { + HelpID = "dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT"; Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 139 ); Size = MAP_APPFONT( 50, 16 ); OutputSize = TRUE; @@ -419,6 +422,7 @@ TabPage PAGE_ADABAS }; Edit ET_HOSTNAME { + HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME"; TabStop = TRUE ; Border = TRUE ; @@ -434,6 +438,7 @@ TabPage PAGE_ADABAS }; NumericField NF_CACHE_SIZE { + HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE"; Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; Border = TRUE ; @@ -451,6 +456,7 @@ TabPage PAGE_ADABAS }; NumericField NF_DATA_INCREMENT { + HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT"; Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; Border = TRUE ; @@ -473,6 +479,7 @@ TabPage PAGE_ADABAS }; Edit ET_CTRLUSERNAME { + HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME"; Border = TRUE ; Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT-1 ) ; Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; @@ -486,6 +493,7 @@ TabPage PAGE_ADABAS }; Edit ET_CTRLPASSWORD { + HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( EDIT_X , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT-1 ) ; Size = MAP_APPFONT ( 105 , EDIT_HEIGHT) ; @@ -495,6 +503,7 @@ TabPage PAGE_ADABAS CheckBox CB_SHUTDB { + HelpID = "dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB"; Pos = MAP_APPFONT ( 6 , 6*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT ) ; Size = MAP_APPFONT ( 248 , CHECKBOX_HEIGHT ) ; Text[ en-US ] = "~Shut down service when closing %PRODUCTNAME"; @@ -502,6 +511,7 @@ TabPage PAGE_ADABAS PushButton PB_STAT { + HelpID = "dbaccess:PushButton:PAGE_ADABAS:PB_STAT"; Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text[ en-US ] = "E~xtended..."; @@ -517,6 +527,7 @@ TabPage PAGE_ADABAS TabPage PAGE_MYSQL_ODBC { + HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; @@ -527,6 +538,7 @@ TabPage PAGE_MYSQL_ODBC TabPage PAGE_MYSQL_JDBC { + HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; @@ -545,6 +557,7 @@ TabPage PAGE_MYSQL_JDBC }; Edit ET_JDBCDRIVERCLASS { + HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS"; Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; @@ -553,6 +566,7 @@ TabPage PAGE_MYSQL_JDBC }; PushButton PB_TESTDRIVERCLASS { + HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS"; TabStop = TRUE ; Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; @@ -564,6 +578,7 @@ TabPage PAGE_MYSQL_JDBC TabPage PAGE_MYSQL_NATIVE { + HelpID = "dbaccess:TabPage:PAGE_MYSQL_NATIVE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; @@ -585,6 +600,7 @@ TabPage PAGE_MYSQL_NATIVE }; Edit ET_USERNAME { + HelpID = "dbaccess:Edit:PAGE_MYSQL_NATIVE:ET_USERNAME"; Border = TRUE ; Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT - 1 ) ; Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; @@ -592,6 +608,7 @@ TabPage PAGE_MYSQL_NATIVE }; CheckBox CB_PASSWORD_REQUIRED { + HelpID = "dbaccess:CheckBox:PAGE_MYSQL_NATIVE:CB_PASSWORD_REQUIRED"; Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 5*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 4*EDIT_HEIGHT ) ; Size = MAP_APPFONT ( 105, CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Password required"; @@ -602,6 +619,7 @@ TabPage PAGE_MYSQL_NATIVE TabPage PAGE_ORACLE_JDBC { + HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; @@ -621,6 +639,7 @@ TabPage PAGE_ORACLE_JDBC }; Edit ET_JDBCDRIVERCLASS { + HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS"; Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 ) ; Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; @@ -629,6 +648,7 @@ TabPage PAGE_ORACLE_JDBC }; PushButton PB_TESTDRIVERCLASS { + HelpID = "dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS"; TabStop = TRUE ; Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - BUTTON_HEIGHT ) / 2 ) ; @@ -744,6 +764,7 @@ TabPage PAGE_USERDRIVER }; Edit ET_HOSTNAME { + HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME"; TabStop = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS -1 ) ; @@ -759,6 +780,7 @@ TabPage PAGE_USERDRIVER NumericField NF_PORTNUMBER { + HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER"; TabStop = TRUE ; Border = TRUE ; NoThousandSep = TRUE; @@ -775,6 +797,7 @@ TabPage PAGE_USERDRIVER }; Edit ET_OPTIONS { + HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS"; Border = TRUE ; TabStop = TRUE ; }; diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index 50b796541872..a698d63e7635 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -109,6 +109,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE ModalDialog DLG_DOMAINPASSWORD { + HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD"; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -125,6 +126,7 @@ ModalDialog DLG_DOMAINPASSWORD Edit ET_PASSWORD { + HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ; Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..5fc9cdc12f23 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -151,6 +151,7 @@ String STR_DATABASEDEFAULTNAME TabPage PAGE_DBWIZARD_MYSQL_INTRO { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -197,6 +198,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO }; RadioButton RB_CONNECTVIANATIVE { + HelpID = "dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE"; Pos = MAP_APPFONT (START_X + 6 , 115 ) ; Size = MAP_APPFONT ( 205 , 9 ) ; Text[ en-US ] = "Connect directly" ; @@ -209,6 +211,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO TabPage PAGE_DBWIZARD_AUTHENTIFICATION { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_AUTHENTIFICATION"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -267,6 +270,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION TabPage PAGE_DBWIZARD_FINAL { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_FINAL"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -343,6 +347,7 @@ TabPage PAGE_DBWIZARD_FINAL TabPage PAGE_DBWIZARD_MYSQL_JDBC { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -370,11 +375,12 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC Text[ en-US ] = "Default: 3306"; }; - AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME) + AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS) }; TabPage PAGE_DBWIZARD_MYSQL_NATIVE { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_NATIVE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0, 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -400,6 +406,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE TabPage PAGE_DBWIZARD_DBASE { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -416,12 +423,13 @@ TabPage PAGE_DBWIZARD_DBASE Text[ en-US ] = "Select the folder where the dBASE files are stored." ; }; - AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION) + AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION) }; TabPage PAGE_DBWIZARD_TEXT { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT"; String STR_TEXT_HEADERTEXT { @@ -440,7 +448,7 @@ TabPage PAGE_DBWIZARD_TEXT }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE) AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X) }; @@ -448,6 +456,7 @@ TabPage PAGE_DBWIZARD_TEXT TabPage PAGE_DBWIZARD_MSACCESS { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -464,13 +473,14 @@ TabPage PAGE_DBWIZARD_MSACCESS Text[ en-US ] = "Please select the Microsoft Access file you want to access."; }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION) // FT_MSACCESS_MDB_FILE }; TabPage PAGE_DBWIZARD_LDAP { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -512,6 +522,7 @@ TabPage PAGE_DBWIZARD_LDAP TabPage PAGE_DBWIZARD_ADABAS { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -527,12 +538,13 @@ TabPage PAGE_DBWIZARD_ADABAS Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ; }; - AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME) + AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME) }; TabPage PAGE_DBWIZARD_ADO { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -547,13 +559,14 @@ TabPage PAGE_DBWIZARD_ADO Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL) + AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL) }; TabPage PAGE_DBWIZARD_ODBC { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -568,23 +581,25 @@ TabPage PAGE_DBWIZARD_ODBC Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE) + AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE) }; TabPage PAGE_DBWIZARD_USERDEFINED { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_USERDEFINED"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE) + AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE) }; TabPage PAGE_DBWIZARD_JDBC { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -599,14 +614,15 @@ TabPage PAGE_DBWIZARD_JDBC Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL) - AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS) + AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL) + AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS) }; TabPage PAGE_DBWIZARD_ORACLE { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -632,12 +648,13 @@ TabPage PAGE_DBWIZARD_ORACLE Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME) + AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS) }; TabPage PAGE_DBWIZARD_SPREADSHEET { + HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET"; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; @@ -654,7 +671,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH ) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH ) String STR_SPREADSHEETPATH{ Text[ en-US ] = "~Location and file name" ; diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index ad401102601d..83ce7090c195 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -93,6 +93,7 @@ Image IMG_ALL_RIGHT_H ModalDialog DLG_DBASE_INDEXES { + HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( WIN_X , WIN_Y ) ; @@ -125,6 +126,7 @@ ModalDialog DLG_DBASE_INDEXES }; ComboBox CB_TABLES { + HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 62 , 5 ) ; @@ -146,6 +148,7 @@ ModalDialog DLG_DBASE_INDEXES }; ListBox LB_TABLEINDEXES { + HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 12 , 44 ) ; @@ -160,6 +163,7 @@ ModalDialog DLG_DBASE_INDEXES }; ListBox LB_FREEINDEXES { + HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 120 , 44 ) ; @@ -168,6 +172,7 @@ ModalDialog DLG_DBASE_INDEXES }; ImageButton IB_ADD { + HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD"; Pos = MAP_APPFONT ( 94 , 60 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -187,6 +192,7 @@ ModalDialog DLG_DBASE_INDEXES }; ImageButton IB_ADDALL { + HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL"; Pos = MAP_APPFONT ( 94 , 77 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -206,6 +212,7 @@ ModalDialog DLG_DBASE_INDEXES }; ImageButton IB_REMOVE { + HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE"; Pos = MAP_APPFONT ( 94 , 98 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -225,6 +232,7 @@ ModalDialog DLG_DBASE_INDEXES }; ImageButton IB_REMOVEALL { + HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL"; Pos = MAP_APPFONT ( 94, 114 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index 230fe4dac320..cdde8fca5ed6 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -40,6 +40,7 @@ ModalDialog DLG_DIRECTSQL { + HelpID = "dbaccess:ModalDialog:DLG_DIRECTSQL"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -60,6 +61,7 @@ ModalDialog DLG_DIRECTSQL }; MultiLineEdit ME_SQL { + HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL"; Pos = MAP_APPFONT( 7, 26 ); Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 80 ); SVLook = TRUE; @@ -69,6 +71,7 @@ ModalDialog DLG_DIRECTSQL }; PushButton PB_EXECUTE { + HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE"; Pos = MAP_APPFONT( WINDOW_SIZE_X - BUTTON_SIZE_X - 7, 109 ); Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y ); Text [ en-US ] = "Execute"; @@ -82,6 +85,7 @@ ModalDialog DLG_DIRECTSQL }; ListBox LB_HISTORY { + HelpID = "dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY"; Pos = MAP_APPFONT( 7, 121 + BUTTON_SIZE_Y + 3 ); Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 14 ); SvLook = TRUE; @@ -96,6 +100,7 @@ ModalDialog DLG_DIRECTSQL }; MultiLineEdit ME_STATUS { + HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS"; Pos = MAP_APPFONT( 7, 153 + BUTTON_SIZE_Y ); Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 41 ); Border = TRUE; @@ -114,6 +119,7 @@ ModalDialog DLG_DIRECTSQL }; PushButton PB_CLOSE { + HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE"; Pos = MAP_APPFONT( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X, 207 + BUTTON_SIZE_Y ); Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y ); Text [ en-US ] = "Close"; diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d550704b85f8..802f88d0869a 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -61,6 +61,7 @@ ModalDialog DLG_SAVE_AS }; ComboBox ET_CATALOG { + HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG"; Border = TRUE ; Pos = MAP_APPFONT ( 77 , 25 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; @@ -77,6 +78,7 @@ ModalDialog DLG_SAVE_AS }; ComboBox ET_SCHEMA { + HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA"; Border = TRUE ; Pos = MAP_APPFONT ( 77 , 42 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; @@ -92,6 +94,7 @@ ModalDialog DLG_SAVE_AS }; Edit ET_TITLE { + HelpID = "dbaccess:Edit:DLG_SAVE_AS:ET_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 77 , 59 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index ade6f3ff1222..128241d211e0 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -62,6 +62,7 @@ ModalDialog DLG_ROWHEIGHT }; MetricField MF_VALUE { + HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 36 , 6 ) ; Size = MAP_APPFONT ( 63 , 12 ) ; @@ -75,6 +76,7 @@ ModalDialog DLG_ROWHEIGHT }; CheckBox CB_STANDARD { + HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD"; Pos = MAP_APPFONT ( 36 , 25 ) ; Size = MAP_APPFONT ( 62 , 12 ) ; TabStop = TRUE ; @@ -117,6 +119,7 @@ ModalDialog DLG_COLWIDTH }; MetricField MF_VALUE { + HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 36 , 6 ) ; Size = MAP_APPFONT ( 63 , 12 ) ; @@ -130,6 +133,7 @@ ModalDialog DLG_COLWIDTH }; CheckBox CB_STANDARD { + HelpID = "dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD"; Pos = MAP_APPFONT ( 36 , 25 ) ; Size = MAP_APPFONT ( 62 , 12 ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 8eff7fffe6c4..f6fca187ba58 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -35,6 +35,7 @@ ModalDialog DLG_DATASOURCE_SELECTION { + HelpID = "dbaccess:ModalDialog:DLG_DATASOURCE_SELECTION"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -50,6 +51,7 @@ ModalDialog DLG_DATASOURCE_SELECTION }; ListBox LB_DATASOURCE { + HelpID = "dbaccess:ListBox:DLG_DATASOURCE_SELECTION:LB_DATASOURCE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 154 , 94 ) ; @@ -79,6 +81,7 @@ ModalDialog DLG_DATASOURCE_SELECTION }; PushButton PB_MANAGE { + HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_MANAGE"; Pos = MAP_APPFONT ( 166 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -88,6 +91,7 @@ ModalDialog DLG_DATASOURCE_SELECTION }; PushButton PB_CREATE { + HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_CREATE"; Pos = MAP_APPFONT ( 166 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index ae8f80d6c616..e4102b9c6f84 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -47,6 +47,7 @@ ModalDialog DLG_INDEXDESIGN { + HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; @@ -132,6 +133,7 @@ ModalDialog DLG_INDEXDESIGN }; CheckBox CB_UNIQUE { + HelpID = "dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE"; Pos = MAP_APPFONT ( LIST_WIDTH + 16, 34 ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ; SVLook = TRUE; @@ -154,6 +156,7 @@ ModalDialog DLG_INDEXDESIGN }; PushButton PB_CLOSE { + HelpID = "dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE"; Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ; Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); SVLook = TRUE; diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 3993096f8847..f654f5627808 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -37,6 +37,7 @@ ModalDialog DLG_PARAMETERS { + HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ; @@ -52,6 +53,7 @@ ModalDialog DLG_PARAMETERS }; ListBox LB_ALLPARAMS { + HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS"; Pos = MAP_APPFONT ( 7 , 12 ) ; Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ; Border = TRUE; @@ -65,6 +67,7 @@ ModalDialog DLG_PARAMETERS }; Edit ET_PARAM { + HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM"; Border = TRUE ; Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ; Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ; @@ -72,6 +75,7 @@ ModalDialog DLG_PARAMETERS }; PushButton BT_TRAVELNEXT { + HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT"; Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4 + 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index 2b1ef6e6baf5..a92110a6eefd 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -53,6 +53,7 @@ ModalDialog DLG_FILTERCRIT HelpId = HID_DLG_FILTERCRIT ; ListBox LB_WHEREFIELD1 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -61,6 +62,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHERECOMP1 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 25 ) ; Size = MAP_APPFONT ( 49 , 72 ) ; @@ -71,6 +73,7 @@ ModalDialog DLG_FILTERCRIT }; Edit ET_WHEREVALUE1 { + HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1"; Border = TRUE ; Pos = MAP_APPFONT ( 177 , 25 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; @@ -78,6 +81,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHERECOND2 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2"; Border = TRUE ; Pos = MAP_APPFONT ( 15 , 41 ) ; Size = MAP_APPFONT ( 41 , 36 ) ; @@ -93,6 +97,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHEREFIELD2 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -101,6 +106,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHERECOMP2 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 41 ) ; Size = MAP_APPFONT ( 49 , 72 ) ; @@ -111,6 +117,7 @@ ModalDialog DLG_FILTERCRIT }; Edit ET_WHEREVALUE2 { + HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2"; Border = TRUE ; Pos = MAP_APPFONT ( 177 , 41 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; @@ -118,6 +125,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHERECOND3 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3"; Border = TRUE ; Pos = MAP_APPFONT ( 15 , 57 ) ; Size = MAP_APPFONT ( 41 , 36 ) ; @@ -133,6 +141,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHEREFIELD3 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -141,6 +150,7 @@ ModalDialog DLG_FILTERCRIT }; ListBox LB_WHERECOMP3 { + HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 57 ) ; Size = MAP_APPFONT ( 49 , 72 ) ; @@ -151,6 +161,7 @@ ModalDialog DLG_FILTERCRIT }; Edit ET_WHEREVALUE3 { + HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3"; Border = TRUE ; Pos = MAP_APPFONT ( 177 , 57 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 2f2f85a797a0..a0806f41988c 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -42,6 +42,7 @@ ModalDialog DLG_ORDERCRIT Closeable = TRUE ; ListBox LB_ORDERFIELD1 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1"; Border = TRUE ; Pos = MAP_APPFONT ( 59 , 25 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; @@ -51,6 +52,7 @@ ModalDialog DLG_ORDERCRIT }; ListBox LB_ORDERVALUE1 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 25 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; @@ -65,6 +67,7 @@ ModalDialog DLG_ORDERCRIT }; ListBox LB_ORDERFIELD2 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2"; Border = TRUE ; Pos = MAP_APPFONT ( 59 , 41 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; @@ -74,6 +77,7 @@ ModalDialog DLG_ORDERCRIT }; ListBox LB_ORDERVALUE2 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 41 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; @@ -88,6 +92,7 @@ ModalDialog DLG_ORDERCRIT }; ListBox LB_ORDERFIELD3 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3"; Border = TRUE ; Pos = MAP_APPFONT ( 59 , 57 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; @@ -97,6 +102,7 @@ ModalDialog DLG_ORDERCRIT }; ListBox LB_ORDERVALUE3 { + HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 57 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index f7600fd137ed..9015704d2878 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -77,6 +77,8 @@ #include "moduledbu.hxx" #endif +#include <tools/urlobj.hxx> + #define BUTTONID_MORE BUTTONID_RETRY + 1 #define DIALOG_WIDTH 220 @@ -689,11 +691,14 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - SmartId aHelpId( m_sHelpURL ); - if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 ) - aHelpId = SmartId( m_sHelpURL.copy( 4 ).toInt32() ); + rtl::OUString aTmp; + INetURLObject aHID( m_sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + aTmp = aHID.GetURLPath(); + else + aTmp = m_sHelpURL; - SetSmartHelpId( aHelpId ); + SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); } } diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index af3d53f785dd..f409477267f9 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -73,6 +73,7 @@ Image BMP_EXCEPTION_INFO_SCH ModalDialog DLG_SQLEXCEPTIONCHAIN { + HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN"; Moveable = TRUE ; Closeable = TRUE ; OutputSize = TRUE ; diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src index cca76e7f65a3..b34a056076a8 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.src +++ b/dbaccess/source/ui/dlg/textconnectionsettings.src @@ -34,6 +34,7 @@ ModalDialog DLG_TEXT_CONNECTION_SETTINGS { + HelpID = "dbaccess:ModalDialog:DLG_TEXT_CONNECTION_SETTINGS"; Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT ); OutputSize = TRUE ; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index f71d33792c99..05a507969765 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -159,9 +159,9 @@ namespace dbaui sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId); + OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId); FixedText* CreateText(USHORT _nTextRes); - void InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler); + void InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler); protected: inline void setRightAligned() { m_bRightAligned = true; } diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index df7208aba9b7..daa8756751cf 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -337,7 +337,7 @@ namespace dbaui @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId); /** set the evaluation flag at the number formatter @param _rxFormatter diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index be49adc0e518..730235b207ad 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -118,7 +118,7 @@ #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 - +#define DLG_TABLE_FILTER RID_DIALOG_START + 32 //======================================================================== // tab pages diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 142da37eb892..77180a01ac05 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1498,13 +1498,13 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) +::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) { ::com::sun::star::util::URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); aURL.Complete += _sModuleName; aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); - aURL.Complete += ::rtl::OUString::valueOf(_nHelpId); + aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8); ::rtl::OUString sAnchor; ::rtl::OUString sTempURL = aURL.Complete; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index f33c82abecb7..fa72a03269cc 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -70,6 +70,8 @@ #include "FieldControls.hxx" #endif +#include "dbaccess_slotid.hrc" + using namespace ::dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 9871c3f7d810..d9c9772d2a41 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -35,6 +35,7 @@ #include "dbaccess_helpid.hrc" #endif +#include "dbaccess_slotid.hrc" #define WINDOW_SIZE_X 276 #define WINDOW_SIZE_Y 185 @@ -67,6 +68,7 @@ String STR_WIZ_NAME_MATCHING_TITEL ModalDialog WIZ_RTFCOPYTABLE { + HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE"; Text [ en-US ] = "Copy RTF Table" ; @@ -91,12 +93,14 @@ ModalDialog WIZ_RTFCOPYTABLE }; PushButton PB_PREV { + HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV"; TabStop = TRUE ; Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "< ~Back"; }; PushButton PB_NEXT { + HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT"; TabStop = TRUE ; Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; Text [ en-US ] = "~Next>"; @@ -130,6 +134,7 @@ TabPage TAB_WIZ_COLUMN_SELECT MultiListBox LB_ORG_COLUMN_NAMES { + HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; @@ -142,6 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT }; ImageButton IB_COLUMN_RH { + HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH"; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -161,6 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT }; ImageButton IB_COLUMNS_RH { + HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH"; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE; @@ -181,6 +188,7 @@ TabPage TAB_WIZ_COLUMN_SELECT }; ImageButton IB_COLUMN_LH { + HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH"; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -200,6 +208,7 @@ TabPage TAB_WIZ_COLUMN_SELECT }; ImageButton IB_COLUMNS_LH { + HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH"; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ; Size = MAP_APPFONT ( 20 , 14 ) ; TabStop = TRUE ; @@ -220,6 +229,7 @@ TabPage TAB_WIZ_COLUMN_SELECT MultiListBox LB_NEW_COLUMN_NAMES { + HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ; Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ; @@ -245,6 +255,7 @@ TabPage TAB_WIZ_TYPE_SELECT MultiListBox LB_NEW_COLUMN_NAMES { + HelpID = "dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ; @@ -264,6 +275,7 @@ TabPage TAB_WIZ_TYPE_SELECT TabPage CONTROL_CONTAINER { + HelpID = "dbaccess:TabPage:CONTROL_CONTAINER"; Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 ); SVLook = TRUE; @@ -286,6 +298,7 @@ TabPage TAB_WIZ_TYPE_SELECT NumericField ET_AUTO { + HelpID = "dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO"; Border = TRUE ; Pos = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -294,6 +307,7 @@ TabPage TAB_WIZ_TYPE_SELECT PushButton PB_AUTO { + HelpID = "dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO"; Pos = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ; Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ; TabStop = TRUE ; @@ -308,7 +322,7 @@ Menu RID_SBA_RTF_PKEYPOPUP MenuItem { Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ; Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; @@ -319,6 +333,7 @@ Menu RID_SBA_RTF_PKEYPOPUP //================================================================== TabPage TAB_WIZ_NAME_MATCHING { + HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -360,6 +375,7 @@ TabPage TAB_WIZ_NAME_MATCHING ImageButton IB_COLUMN_UP { + HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP"; Pos = MAP_APPFONT ( 19 , 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE; @@ -380,6 +396,7 @@ TabPage TAB_WIZ_NAME_MATCHING }; ImageButton IB_COLUMN_DOWN { + HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN"; Pos = MAP_APPFONT ( 19 , 63 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE; @@ -399,6 +416,7 @@ TabPage TAB_WIZ_NAME_MATCHING }; ImageButton IB_COLUMN_UP_RIGHT { + HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT"; Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE; @@ -419,6 +437,7 @@ TabPage TAB_WIZ_NAME_MATCHING }; ImageButton IB_COLUMN_DOWN_RIGHT { + HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT"; Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -439,6 +458,7 @@ TabPage TAB_WIZ_NAME_MATCHING PushButton PB_ALL { + HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL"; Pos = MAP_APPFONT ( 6, 83) ; Size = MAP_APPFONT ( 40 , 14 ) ; TabStop = TRUE ; @@ -447,6 +467,7 @@ TabPage TAB_WIZ_NAME_MATCHING PushButton PB_NONE { + HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE"; Pos = MAP_APPFONT ( 6, 103) ; Size = MAP_APPFONT ( 40 , 14 ) ; TabStop = TRUE ; @@ -485,12 +506,14 @@ TabPage TAB_WIZ_COPYTABLE }; RadioButton RB_DEFDATA { + HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA"; Pos = MAP_APPFONT ( 12 , 35 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "De~finition and data" ; }; RadioButton RB_DEF { + HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF"; Pos = MAP_APPFONT ( 12, 49 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Def~inition" ; @@ -498,6 +521,7 @@ TabPage TAB_WIZ_COPYTABLE RadioButton RB_VIEW { + HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW"; Pos = MAP_APPFONT ( 12, 63 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "A~s table view"; @@ -505,6 +529,7 @@ TabPage TAB_WIZ_COPYTABLE RadioButton RB_APPENDDATA { + HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA"; Pos = MAP_APPFONT ( 12, 77 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; Text [ en-US ] = "Append ~data" ; @@ -512,6 +537,7 @@ TabPage TAB_WIZ_COPYTABLE CheckBox CB_USEHEADERLINE { + HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_USEHEADERLINE"; Pos = MAP_APPFONT ( 12, 93 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ; Text [ en-US ] = "Use first ~line as column names" ; @@ -519,6 +545,7 @@ TabPage TAB_WIZ_COPYTABLE CheckBox CB_PRIMARY_COLUMN { + HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN"; Pos = MAP_APPFONT ( 12, 107 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Crea~te primary key"; @@ -532,6 +559,7 @@ TabPage TAB_WIZ_COPYTABLE Edit ET_KEYNAME { + HelpID = "dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME"; Pos = MAP_APPFONT ( 80, 120 ) ; Size = MAP_APPFONT ( 65 , 12 ) ; TabStop = TRUE ; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 7bded25d5a7d..66b6eec9465c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2700,7 +2700,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window _pControl->EnableInput(bEnable); } // ----------------------------------------------------------------------------- -void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId) +void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId) { m_pTextCell->SetText(_sText); m_pTextCell->ClearModifyFlag(); @@ -2709,10 +2709,10 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c enableControl(_rEntry,m_pTextCell); - if (m_pTextCell->GetHelpId() != _nHelpId) + if (m_pTextCell->GetHelpId() != _sHelpId) // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen m_pTextCell->SetHelpText(String()); - m_pTextCell->SetHelpId(_nHelpId); + m_pTextCell->SetHelpId(_sHelpId); } // ----------------------------------------------------------------------------- void OSelectionBrowseBox::invalidateUndoRedo() diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index e4fd3471fd97..3d215a81f4c8 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -261,7 +261,7 @@ namespace dbaui void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index 687df3159186..730cbb4ed780 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -82,6 +82,7 @@ ModalDialog DLG_QRY_JOIN }; CheckBox CB_NATURAL { + HelpID = "dbaccess:CheckBox:DLG_QRY_JOIN:CB_NATURAL"; Pos = MAP_APPFONT ( 101 , 31 ) ; Size = MAP_APPFONT ( 89 , 8 ) ; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f64cabd58653..4d3cdb6652a9 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -107,6 +107,8 @@ #endif #include "dsntypes.hxx" +#include "dbaccess_slotid.hrc" + using namespace ::dbaui; using namespace ::comphelper; using namespace ::svt; diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index e2a73292ec8d..0f1168f97c8f 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -175,7 +175,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU MenuItem { Identifier = SID_TABLEDESIGN_INSERTROWS ; - HelpID = SID_TABLEDESIGN_INSERTROWS ; + HelpID = HID_TABLEDESIGN_INSERTROWS ; Text [ en-US ] = "Insert Rows" ; }; MenuItem @@ -185,7 +185,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU MenuItem { Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ; Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index bc49f49b87e6..094b4fbfecd0 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/util/hidother.src @@ -26,10 +26,6 @@ ************************************************************************/ #include "../inc/dbaccess_helpid.hrc" -#include "../inc/dbaccess_slotid.hrc" -#ifndef _SBASLTID_HRC -#include <svx/svxids.hrc> -#endif hidspecial HID_DLG_FILTERCRIT { HelpId = HID_DLG_FILTERCRIT; }; hidspecial HID_DLG_ORDERCRIT { HelpId = HID_DLG_ORDERCRIT; }; @@ -148,8 +144,11 @@ hidspecial HID_TABDESIGN_TYPECELL { HelpId = HID_TABDESIGN hidspecial HID_TABDESIGN_COMMENTCELL { HelpId = HID_TABDESIGN_COMMENTCELL; }; hidspecial HID_TABDESIGN_HELPTEXT { HelpId = HID_TABDESIGN_HELPTEXT; }; +/* hidspecial SID_TABLEDESIGN_INSERTROWS { HelpId = SID_TABLEDESIGN_INSERTROWS; }; hidspecial SID_TABLEDESIGN_TABED_PRIMARYKEY { HelpId = SID_TABLEDESIGN_TABED_PRIMARYKEY; }; +*/ + hidspecial HID_TLB_TABLEDESIGN { HelpId = HID_TLB_TABLEDESIGN; }; hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; }; hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; }; @@ -169,7 +168,6 @@ hidspecial HID_BROWSER_TABLE_CREATE_DESIGN { HelpId = HID_BROWSER_T hidspecial HID_BROWSER_TABLE_EDIT { HelpId = HID_BROWSER_TABLE_EDIT; }; hidspecial HID_BROWSER_TABLE_DELETE { HelpId = HID_BROWSER_TABLE_DELETE; }; hidspecial HID_SQLERROR_EXCHAIN_ERRORS { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; }; -hidspecial HID_DBACCESS_START { HelpId = HID_DBACCESS_START; }; hidspecial HID_SQLERROR_EXCHAIN_TEXT { HelpId = HID_SQLERROR_EXCHAIN_TEXT; }; hidspecial HID_TAB_WIZ_COLUMN_SELECT { HelpId = HID_TAB_WIZ_COLUMN_SELECT; }; hidspecial HID_TAB_WIZ_TYPE_SELECT { HelpId = HID_TAB_WIZ_TYPE_SELECT; }; @@ -254,11 +252,13 @@ hidspecial HID_DLG_REL_CASC_UPD_DEFAULT { HelpId = HID_DLG_REL_C hidspecial HID_BROWSER_SAVE_RECORD { HelpId = HID_BROWSER_SAVE_RECORD ; }; hidspecial HID_BROWSER_UNDO_RECORD { HelpId = HID_BROWSER_UNDO_RECORD ; }; +/* // missing pre processor for helpids so we have to include them here hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION ; }; hidspecial SID_FM_NATIVESQL { HelpId = SID_FM_NATIVESQL ; }; hidspecial SID_FM_ADDTABLE { HelpId = SID_FM_ADDTABLE ; }; hidspecial SID_FM_EXECUTE { HelpId = SID_FM_EXECUTE ; }; +*/ hidspecial HID_DSADMIN_SQL92CHECK { HelpId = HID_DSADMIN_SQL92CHECK ; }; hidspecial HID_DSADMIN_AUTOINCREMENTVALUE { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; }; @@ -301,7 +301,6 @@ hidspecial UID_APP_VIEW_VERT_SPLIT { HelpId = UID_APP_VIEW_ hidspecial UID_APP_VIEW_BORDER_WIN { HelpId = UID_APP_VIEW_BORDER_WIN ; }; hidspecial HID_APP_CREATION_LIST { HelpId = HID_APP_CREATION_LIST ; }; hidspecial UID_APP_SWAP_VIEW { HelpId = UID_APP_SWAP_VIEW ; }; -hidspecial UID_DLG_TABLE_FILTER { HelpId = UID_DLG_TABLE_FILTER ; }; hidspecial HID_APP_SWAP_ICONCONTROL { HelpId = HID_APP_SWAP_ICONCONTROL ; }; hidspecial HID_DSADMIN_APPENDTABLEALIAS { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; }; @@ -350,13 +349,13 @@ hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE { HelpId = HID_P hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; }; hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; }; +/* hidspecial SID_INDEXDESIGN { HelpId = SID_INDEXDESIGN; }; hidspecial SID_DOCUMENT_DATA_SOURCE { HelpId = SID_DOCUMENT_DATA_SOURCE; }; hidspecial SID_DB_NEW { HelpId = SID_DB_NEW; }; hidspecial SID_DB_APP_DISABLE_PREVIEW { HelpId = SID_DB_APP_DISABLE_PREVIEW; }; hidspecial SID_DB_APP_DSCONNECTION_TYPE { HelpId = SID_DB_APP_DSCONNECTION_TYPE; }; hidspecial SID_DB_APP_DSADVANCED_SETTINGS { HelpId = SID_DB_APP_DSADVANCED_SETTINGS; }; - hidspecial SID_DB_APP_VIEW_DOCINFO_PREVIEW { HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW; }; hidspecial SID_DB_APP_VIEW_DOC_PREVIEW { HelpId = SID_DB_APP_VIEW_DOC_PREVIEW; }; hidspecial SID_DB_APP_VIEW_TABLES { HelpId = SID_DB_APP_VIEW_TABLES; }; @@ -369,38 +368,31 @@ hidspecial SID_DB_APP_TABLEFILTER { HelpId = SID_DB_APP_TABLEFILTER; }; hidspecial SID_DB_APP_CLOSECONNECTION { HelpId = SID_DB_APP_CLOSECONNECTION; }; hidspecial SID_DB_APP_DSPROPS { HelpId = SID_DB_APP_DSPROPS; }; hidspecial SID_DB_APP_DBADMIN { HelpId = SID_DB_APP_DBADMIN; }; - hidspecial SID_DB_APP_CONVERTTOVIEW { HelpId = SID_DB_APP_CONVERTTOVIEW; }; hidspecial SID_DB_APP_REFRESH_TABLES { HelpId = SID_DB_APP_REFRESH_TABLES; }; hidspecial SID_DB_APP_VIEW_REPORTS { HelpId = SID_DB_APP_VIEW_REPORTS; }; hidspecial SID_DB_APP_DSEXPORT { HelpId = SID_DB_APP_DSEXPORT; }; - hidspecial SID_DB_APP_TABLE_DELETE { HelpId = SID_DB_APP_TABLE_DELETE; }; hidspecial SID_DB_APP_TABLE_RENAME { HelpId = SID_DB_APP_TABLE_RENAME; }; hidspecial SID_DB_APP_TABLE_EDIT { HelpId = SID_DB_APP_TABLE_EDIT; }; hidspecial SID_DB_APP_TABLE_OPEN { HelpId = SID_DB_APP_TABLE_OPEN; }; - hidspecial SID_DB_APP_QUERY_DELETE { HelpId = SID_DB_APP_QUERY_DELETE; }; hidspecial SID_DB_APP_QUERY_RENAME { HelpId = SID_DB_APP_QUERY_RENAME; }; hidspecial SID_DB_APP_QUERY_EDIT { HelpId = SID_DB_APP_QUERY_EDIT; }; hidspecial SID_DB_APP_QUERY_OPEN { HelpId = SID_DB_APP_QUERY_OPEN; }; - hidspecial SID_DB_APP_FORM_DELETE { HelpId = SID_DB_APP_FORM_DELETE; }; hidspecial SID_DB_APP_FORM_RENAME { HelpId = SID_DB_APP_FORM_RENAME; }; hidspecial SID_DB_APP_FORM_EDIT { HelpId = SID_DB_APP_FORM_EDIT; }; hidspecial SID_DB_APP_FORM_OPEN { HelpId = SID_DB_APP_FORM_OPEN; }; - hidspecial SID_DB_APP_REPORT_DELETE { HelpId = SID_DB_APP_REPORT_DELETE; }; hidspecial SID_DB_APP_REPORT_RENAME { HelpId = SID_DB_APP_REPORT_RENAME; }; hidspecial SID_DB_APP_REPORT_EDIT { HelpId = SID_DB_APP_REPORT_EDIT; }; hidspecial SID_DB_APP_REPORT_OPEN { HelpId = SID_DB_APP_REPORT_OPEN; }; - hidspecial SID_DB_APP_DELETE { HelpId = SID_DB_APP_DELETE; }; hidspecial SID_DB_APP_RENAME { HelpId = SID_DB_APP_RENAME; }; hidspecial SID_DB_APP_EDIT { HelpId = SID_DB_APP_EDIT; }; hidspecial SID_DB_APP_EDIT_SQL_VIEW { HelpId = SID_DB_APP_EDIT_SQL_VIEW; }; hidspecial SID_DB_APP_OPEN { HelpId = SID_DB_APP_OPEN; }; - hidspecial SID_BROWSER_CLEAR_QUERY { HelpId = SID_BROWSER_CLEAR_QUERY; }; hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION; }; hidspecial SID_QUERY_VIEW_FUNCTIONS { HelpId = SID_QUERY_VIEW_FUNCTIONS; }; @@ -410,58 +402,47 @@ hidspecial SID_QUERY_DISTINCT_VALUES { HelpId = SID_QUERY_DISTINCT_VALUES; }; hidspecial SID_FORM_CREATE_REPWIZ_PRE_SEL { HelpId = SID_FORM_CREATE_REPWIZ_PRE_SEL; }; hidspecial SID_REPORT_CREATE_REPWIZ_PRE_SEL { HelpId = SID_REPORT_CREATE_REPWIZ_PRE_SEL; }; hidspecial SID_APP_NEW_REPORT_PRE_SEL { HelpId = SID_APP_NEW_REPORT_PRE_SEL; }; - hidspecial SID_APP_NEW_FOLDER { HelpId = SID_APP_NEW_FOLDER; }; hidspecial SID_APP_NEW_FORM { HelpId = SID_APP_NEW_FORM; }; hidspecial SID_DB_APP_PASTE_SPECIAL { HelpId = SID_DB_APP_PASTE_SPECIAL; }; hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW; }; - hidspecial SID_DB_APP_STATUS_TYPE { HelpId = SID_DB_APP_STATUS_TYPE; }; hidspecial SID_DB_APP_STATUS_DBNAME { HelpId = SID_DB_APP_STATUS_DBNAME; }; hidspecial SID_DB_APP_STATUS_USERNAME { HelpId = SID_DB_APP_STATUS_USERNAME; }; hidspecial SID_DB_APP_STATUS_HOSTNAME { HelpId = SID_DB_APP_STATUS_HOSTNAME; }; - hidspecial SID_DB_APP_SENDREPORTASMAIL { HelpId = SID_DB_APP_SENDREPORTASMAIL; }; hidspecial SID_DB_APP_SENDREPORTTOWRITER { HelpId = SID_DB_APP_SENDREPORTTOWRITER; }; hidspecial SID_DB_NEW_VIEW_SQL { HelpId = SID_DB_NEW_VIEW_SQL; }; +*/ hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; }; - hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; }; - hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; }; - hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; }; hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; }; - hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; }; - hidspecial HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME ; }; hidspecial HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME ; }; - hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; }; hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; }; - hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; }; - hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; }; - hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; }; @@ -487,7 +468,11 @@ hidspecial HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD { He hidspecial HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ; }; hidspecial HID_DSADMIN_USESSL_LDAP { HelpId = HID_DSADMIN_USESSL_LDAP ; }; hidspecial HID_DSADMIN_DOSLINEENDS { HelpId = HID_DSADMIN_DOSLINEENDS ; }; + +/* hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW ; }; +*/ + hidspecial HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE ; }; hidspecial HID_PAGE_DBWIZARD_USERDEFINED_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_BROWSE ; }; hidspecial HID_DLG_DATABASE_WIZARD { HelpId = HID_DLG_DATABASE_WIZARD ; }; diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index f73782a1d8d4..7b543169e032 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -27,104 +27,96 @@ #ifndef RTPUI_REPORTDESIGN_HELPID_HRC #define RTPUI_REPORTDESIGN_HELPID_HRC -#ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_RPT_DBACCESS_START -#endif +#define UID_RPT_PROP_FORMULA "REPORTDESIGN_UID_RPT_PROP_FORMULA" +#define UID_RPT_RPT_PROP_DLG_FONT_TYPE "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE" +#define UID_RPT_RPT_PROP_DLG_AREA "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA" +#define UID_RPT_PROP_CHARTTYPE_DLG "REPORTDESIGN_UID_RPT_PROP_CHARTTYPE_DLG" +#define UID_RPT_PROP_DLG_LINKFIELDS "REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS" -#define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) -#define UID_RPT_SCROLLWINDOW (HID_RPT_START + 1) -#define UID_RPT_REPORTWINDOW (HID_RPT_START + 2) -#define HID_RPT_HORZ_RULER (HID_RPT_START + 3) -#define UID_RPT_SECTIONSWINDOW (HID_RPT_START + 4) -#define UID_RPT_VIEWSWINDOW (HID_RPT_START + 5) -#define HID_RPT_ENDMARKER (HID_RPT_START + 6) -#define HID_RPT_SPLITTER (HID_RPT_START + 7) -#define HID_REPORTSECTION (HID_RPT_START + 8) -#define HID_RPT_HORZ_SCROLLBAR (HID_RPT_START + 9) -#define HID_RPT_VERT_SCROLLBAR (HID_RPT_START + 10) -#define HID_RPT_STARTMARKER (HID_RPT_START + 11) -#define HID_RPT_FIELDEXPRESSION (HID_RPT_START + 12) -#define HID_RPT_SORTORDER (HID_RPT_START + 13) -#define HID_RPT_GROUPSBRW (HID_RPT_START + 14) -#define HID_RPT_GROUPSSORTING_DLG (HID_RPT_START + 15) -#define HID_RPT_PAGENUMBERS_DLG (HID_RPT_START + 16) -#define HID_RPT_DATETIME_DLG (HID_RPT_START + 17) -#define HID_RPT_CONDFORMAT_DLG (HID_RPT_START + 18) -#define HID_RPT_CONDFORMAT_TB (HID_RPT_START + 19) -#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) -#define HID_RPT_COND_DLG (HID_RPT_START + 21) -#define HID_RPT_POPUP_COLOR_CTRL (HID_RPT_START + 22) -#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) -#define HID_RPT_FIELD_SEL (HID_RPT_START + 24) -#define HID_RPT_FIELD_SEL_WIN (HID_RPT_START + 25) -#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) -#define HID_RPT_PROPDLG_TAB_DATA (HID_RPT_START + 27) +#define UID_RPT_RPT_APP_VIEW "REPORTDESIGN_UID_RPT_RPT_APP_VIEW" +#define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW" +#define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW" +#define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER" +#define UID_RPT_SECTIONSWINDOW "REPORTDESIGN_UID_RPT_SECTIONSWINDOW" +#define UID_RPT_VIEWSWINDOW "REPORTDESIGN_UID_RPT_VIEWSWINDOW" +#define HID_RPT_ENDMARKER "REPORTDESIGN_HID_RPT_ENDMARKER" +#define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER" +#define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION" +#define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR" +#define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR" +#define HID_RPT_STARTMARKER "REPORTDESIGN_HID_RPT_STARTMARKER" +#define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION" +#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER" +#define HID_RPT_GROUPSBRW "REPORTDESIGN_HID_RPT_GROUPSBRW" +#define HID_RPT_GROUPSSORTING_DLG "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG" +#define HID_RPT_PAGENUMBERS_DLG "REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG" +#define HID_RPT_DATETIME_DLG "REPORTDESIGN_HID_RPT_DATETIME_DLG" +#define HID_RPT_CONDFORMAT_DLG "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG" +#define HID_RPT_CONDFORMAT_TB "REPORTDESIGN_HID_RPT_CONDFORMAT_TB" +#define HID_RPT_CRTL_FORMAT_PREVIEW "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW" +#define HID_RPT_COND_DLG "REPORTDESIGN_HID_RPT_COND_DLG" +#define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL" +#define HID_RPT_POPUP_COLOR "REPORTDESIGN_HID_RPT_POPUP_COLOR" +#define HID_RPT_FIELD_SEL "REPORTDESIGN_HID_RPT_FIELD_SEL" +#define HID_RPT_FIELD_SEL_WIN "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN" +#define HID_RPT_PROPDLG_TAB_GENERAL "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL" +#define HID_RPT_PROPDLG_TAB_DATA "REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA" -#define HID_RPT_PROP_FORCENEWPAGE (HID_RPT_START + 28) -#define HID_RPT_PROP_NEWROWORCOL (HID_RPT_START + 29) -#define HID_RPT_PROP_KEEPTOGETHER (HID_RPT_START + 30) -#define HID_RPT_PROP_CANGROW (HID_RPT_START + 31) -#define HID_RPT_PROP_CANSHRINK (HID_RPT_START + 32) -#define HID_RPT_PROP_REPEATSECTION (HID_RPT_START + 33) -#define HID_RPT_PROP_FORMULALIST (HID_RPT_START + 34) -#define HID_RPT_PROP_SCOPE (HID_RPT_START + 35) -#define HID_RPT_PROP_TYPE (HID_RPT_START + 36) -#define HID_RPT_PROP_MASTERFIELDS (HID_RPT_START + 37) -#define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) -#define HID_RPT_PROP_AREA (HID_RPT_START + 39) -#define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) -#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) +#define HID_RPT_PROP_FORCENEWPAGE "REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" +#define HID_RPT_PROP_NEWROWORCOL "REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" +#define HID_RPT_PROP_KEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" +#define HID_RPT_PROP_CANGROW "REPORTDESIGN_HID_RPT_PROP_CANGROW" +#define HID_RPT_PROP_CANSHRINK "REPORTDESIGN_HID_RPT_PROP_CANSHRINK" +#define HID_RPT_PROP_REPEATSECTION "REPORTDESIGN_HID_RPT_PROP_REPEATSECTION" +#define HID_RPT_PROP_FORMULALIST "REPORTDESIGN_HID_RPT_PROP_FORMULALIST" +#define HID_RPT_PROP_SCOPE "REPORTDESIGN_HID_RPT_PROP_SCOPE" +#define HID_RPT_PROP_TYPE "REPORTDESIGN_HID_RPT_PROP_TYPE" +#define HID_RPT_PROP_MASTERFIELDS "REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS" +#define HID_RPT_PROP_DETAILFIELDS "REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS" +#define HID_RPT_PROP_AREA "REPORTDESIGN_HID_RPT_PROP_AREA" +#define HID_RPT_PROP_MIMETYPE "REPORTDESIGN_HID_RPT_PROP_MIMETYPE" // free // free -#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) -#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) -#define HID_RPT_PROP_VERTICALALIGN (HID_RPT_START + 46) -#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) -#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48) -#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49) -#define HID_RPT_PROP_PARAADJUST (HID_RPT_START + 50) -#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) -#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) -#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53) +#define HID_RPT_PROP_PRINTREPEATEDVALUES "REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" +#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" +#define HID_RPT_PROP_VERTICALALIGN "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN" +#define HID_RPT_PROP_STARTNEWCOLUMN "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN" +#define HID_RPT_PROP_STARTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_STARTNEWPAGE" +#define HID_RPT_PROP_RESETPAGENUMBER "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER" +#define HID_RPT_PROP_PARAADJUST "REPORTDESIGN_HID_RPT_PROP_PARAADJUST" +#define HID_RPT_PROP_MINHEIGHTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_MINHEIGHTNEWPAGE" +#define HID_RPT_PROP_PRINTWHENGROUPCHANGE "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" +#define HID_RPT_PROP_CHARTTYPE "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE" // free // free -#define HID_RPT_PROP_VISIBLE (HID_RPT_START + 55) -#define HID_RPT_PROP_GROUPKEEPTOGETHER (HID_RPT_START + 56) -#define HID_RPT_PROP_PAGEHEADEROPTION (HID_RPT_START + 57) -#define HID_RPT_PROP_PAGEFOOTEROPTION (HID_RPT_START + 58) -#define UID_RPT_PROP_DLG_LINE_STYLE (HID_RPT_START + 59) -#define HID_RPT_PROP_PREVIEW_COUNT (HID_RPT_START + 60) -#define HID_RPT_PROP_DATAFIELD (HID_RPT_START + 61) -#define HID_RPT_PROP_BACKCOLOR (HID_RPT_START + 62) -#define HID_RPT_PROP_RPT_POSITIONX (HID_RPT_START + 63) -#define HID_RPT_PROP_RPT_POSITIONY (HID_RPT_START + 64) -#define HID_RPT_PROP_RPT_WIDTH (HID_RPT_START + 65) -#define HID_RPT_PROP_RPT_HEIGHT (HID_RPT_START + 66) -#define HID_RPT_START_TITLE (HID_RPT_START + 67) -#define HID_RPT_START_IMAGE (HID_RPT_START + 68) -#define HID_RPT_PROP_DEEPTRAVERSING (HID_RPT_START + 69) -#define HID_RPT_PROP_PREEVALUATED (HID_RPT_START + 70) -#define HID_RPT_NAVIGATOR_DLG (HID_RPT_START + 71) -#define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) -#define HID_RPT_PROP_FORMULA (HID_RPT_START + 73) -#define HID_RPT_PROP_INITIALFORMULA (HID_RPT_START + 74) -#define HID_RPT_PROP_RPT_FONT (HID_RPT_START + 75) -#define UID_RPT_RPT_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) -#define HID_RPT_PROP_PRESERVEIRI (HID_RPT_START + 77) -#define HID_RPT_PROP_BACKTRANSPARENT (HID_RPT_START + 78) -#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) -#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) -#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81) -#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82) +#define HID_RPT_PROP_VISIBLE "REPORTDESIGN_HID_RPT_PROP_VISIBLE" +#define HID_RPT_PROP_GROUPKEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" +#define HID_RPT_PROP_PAGEHEADEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" +#define HID_RPT_PROP_PAGEFOOTEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" +#define UID_RPT_PROP_DLG_LINE_STYLE "REPORTDESIGN_UID_RPT_PROP_DLG_LINE_STYLE" +#define HID_RPT_PROP_PREVIEW_COUNT "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT" +#define HID_RPT_PROP_DATAFIELD "REPORTDESIGN_HID_RPT_PROP_DATAFIELD" +#define HID_RPT_PROP_BACKCOLOR "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" +#define HID_RPT_PROP_RPT_POSITIONX "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" +#define HID_RPT_PROP_RPT_POSITIONY "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" +#define HID_RPT_PROP_RPT_WIDTH "REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" +#define HID_RPT_PROP_RPT_HEIGHT "REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" +#define HID_RPT_START_TITLE "REPORTDESIGN_HID_RPT_START_TITLE" +#define HID_RPT_START_IMAGE "REPORTDESIGN_HID_RPT_START_IMAGE" +#define HID_RPT_PROP_DEEPTRAVERSING "REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING" +#define HID_RPT_PROP_PREEVALUATED "REPORTDESIGN_HID_RPT_PROP_PREEVALUATED" +#define HID_RPT_NAVIGATOR_DLG "REPORTDESIGN_HID_RPT_NAVIGATOR_DLG" +#define HID_REPORT_NAVIGATOR_TREE "REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE" +#define HID_RPT_PROP_FORMULA "REPORTDESIGN_HID_RPT_PROP_FORMULA" +#define HID_RPT_PROP_INITIALFORMULA "REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA" +#define HID_RPT_PROP_RPT_FONT "REPORTDESIGN_HID_RPT_PROP_RPT_FONT" +#define HID_RPT_PROP_PRESERVEIRI "REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" +#define HID_RPT_PROP_BACKTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" +#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT" -#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82) -#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) -#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) - -#if UID_RPT_PROP_FORMULA > HID_RPT_END -#error Help-Id Ueberlauf in #file, #line -#endif -// don't forget to update the file util/hidother.src +#define HID_RPT_GROUPSORT_MOVE_UP "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP" +#define HID_RPT_GROUPSORT_MOVE_DOWN "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN" +#define HID_RPT_GROUPSORT_DELETE "REPORTDESIGN_HID_RPT_GROUPSORT_DELETE" #endif //RTPUI_REPORTDESIGN_HELPID_HRC diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 0e30747fb78c..09e557007ab4 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -47,6 +47,7 @@ ModalDialog RID_DATETIME_DLG CheckBox CB_DATE { + HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; @@ -62,6 +63,7 @@ ModalDialog RID_DATETIME_DLG ListBox LB_DATE_TYPE { + HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE"; Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); Border = TRUE; @@ -78,6 +80,7 @@ ModalDialog RID_DATETIME_DLG }; CheckBox CB_TIME { + HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; @@ -93,6 +96,7 @@ ModalDialog RID_DATETIME_DLG ListBox LB_TIME_TYPE { + HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE"; Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); Border = TRUE; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c54380cb7d2a..682ec6b17438 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -99,7 +99,7 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -209,7 +209,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 2c73fff07de4..186fb771ad46 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -166,6 +166,7 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_ORDER { + HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER"; Border = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT - 1 ); Size = MAP_APPFONT( LISTBOX_WIDTH, 60 ); @@ -190,6 +191,7 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_HEADERLST { + HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT -1); @@ -213,6 +215,7 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_FOOTERLST { + HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT -1); @@ -236,6 +239,7 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_GROUPONLST { + HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT -1); @@ -257,6 +261,7 @@ FloatingWindow RID_GROUPS_SORTING }; NumericField ED_GROUPINTERVALLST { + HelpID = "reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT -1); @@ -273,6 +278,7 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_KEEPTOGETHERLST { + HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT -1); diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 496bae3b0ab7..b9e639dfe646 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -110,7 +110,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SORTINGANDGROUPING; - HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -121,7 +120,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_PAGEHEADERFOOTER; - HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Page Header/Footer..."; @@ -129,7 +127,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_REPORTHEADERFOOTER; - HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Report Header/Footer..."; @@ -141,7 +138,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_RPT_NEW_FUNCTION; - HelpId = SID_RPT_NEW_FUNCTION; Command = ".uno:NewFunction"; Text [ en-US ] = "New Function"; }; @@ -152,7 +148,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; - HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 31c5bdb4026c..c5c760e1755d 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -54,6 +54,7 @@ ModalDialog RID_PAGENUMBERS RadioButton RB_PAGE_N { + HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; @@ -62,6 +63,7 @@ ModalDialog RID_PAGENUMBERS }; RadioButton RB_PAGE_N_OF_M { + HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Page N of M"; @@ -76,6 +78,7 @@ ModalDialog RID_PAGENUMBERS RadioButton RB_PAGE_TOPPAGE { + HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; @@ -84,6 +87,7 @@ ModalDialog RID_PAGENUMBERS }; RadioButton RB_PAGE_BOTTOMPAGE { + HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Bottom of Page (Footer)"; @@ -104,6 +108,7 @@ ModalDialog RID_PAGENUMBERS }; ListBox LST_ALIGNMENT { + HelpID = "reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT"; Border = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT -1); Size = MAP_APPFONT( LISTBOX_WIDTH, 60 ); @@ -121,6 +126,7 @@ ModalDialog RID_PAGENUMBERS }; CheckBox CB_SHOWNUMBERONFIRSTPAGE { + HelpID = "reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Check = TRUE; diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 48da4e0eb180..e2a43c163808 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -81,7 +81,7 @@ public: virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; - virtual long getHelpId() const ; + virtual rtl::OString getHelpId() const ; virtual sal_uInt32 getParameterCount() const ; virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 5ab2f53467ba..3cc2a20cc465 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -60,7 +60,7 @@ namespace rptui // IPropertyInfoService sal_Int32 getPropertyId(const String& _rName) const; String getPropertyTranslation(sal_Int32 _nId) const; - sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; + rtl::OString getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); @@ -83,7 +83,7 @@ namespace rptui class HelpIdUrl { public: - static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); + static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId ); }; //======================================================================== diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index d62a9443d490..8ac5053ff39f 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -285,7 +285,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; @@ -295,7 +295,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); - aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); aOut.HasPrimaryButton = sal_True; break; default: diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 929225751437..48d8c74e0c01 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -41,17 +41,20 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include "metadata.hxx" +#include <tools/urlobj.hxx> //........................................................................ namespace rptui { //........................................................................ //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; - aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + aBuffer.appendAscii( INET_HID_SCHEME ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } @@ -235,7 +238,7 @@ namespace rptui { const sal_Char* programmaticName; USHORT uiNameResId; - sal_uInt32 helpId; + rtl::OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index cc4a4d709941..084bd77f8d5b 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -777,12 +777,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const break; case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_FORMULA: - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; @@ -797,7 +797,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( m_nDataFieldType == DATA_OR_FORMULA ) { - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; } @@ -824,12 +824,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_FONT: - aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; case PROPERTY_ID_AREA: - aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 4cd952e05e1f..2c98d134196e 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -58,7 +58,7 @@ namespace rptui { String sName; String sTranslation; - sal_uInt32 nHelpId; + rtl::OString sHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; @@ -68,16 +68,16 @@ namespace rptui sal_Int32 _nId, const String& aTranslation, sal_uInt16 nPosId, - sal_uInt32 nHelpId, + const rtl::OString& _sHelpId, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags) + const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) - ,nHelpId(nHid) + ,sHelpId(sHid) ,nId(_nId) ,nPos(nP) ,nUIFlags(_nUIFlags) @@ -200,10 +200,10 @@ namespace rptui } //------------------------------------------------------------------------ - sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->nHelpId : 0; + return (pInfo) ? pInfo->sHelpId : rtl::OString(); } //------------------------------------------------------------------------ @@ -219,7 +219,7 @@ namespace rptui // intialisierung if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0); + OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0); const OPropertyInfoImpl* pPropInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 4e15218c2af8..791251e0424a 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -221,9 +221,9 @@ void FunctionDescription::initArgumentInfo() const return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -long FunctionDescription::getHelpId() const +rtl::OString FunctionDescription::getHelpId() const { - return 0; + return rtl::OString(); } // ----------------------------------------------------------------------------- sal_uInt32 FunctionDescription::getParameterCount() const diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 37a67f99eb63..339e136c2fec 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -203,7 +203,7 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -600,7 +600,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); m_pAddField->Update(); diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 4a84f7bd034d..95d1629d13ac 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -32,7 +32,7 @@ #ifndef _SBASLTID_HRC #include <svx/svxids.hrc> #endif - +#include "helpids.hrc" // Dialog Controls --------------------------------------------------------------- @@ -298,7 +298,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SORTINGANDGROUPING; - HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -309,14 +308,12 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND; - HelpId = SID_ATTR_CHAR_COLOR_BACKGROUND ; Command = ".uno:DBBackgroundColor"; Text [ en-US ] = "Background Color..."; }; MenuItem { Identifier = SID_RULER; - HelpId = SID_RULER ; Command = ".uno:ShowRuler"; Checkable = TRUE; Text [ en-US ] = "Ruler..."; @@ -324,7 +321,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_GRID_VISIBLE; - HelpId = SID_GRID_VISIBLE ; Command = ".uno:GridVisible"; Checkable = TRUE; Text [ en-US ] = "Grid..."; @@ -336,14 +332,12 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_PAGEHEADERFOOTER; - HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; }; MenuItem { Identifier = SID_REPORTHEADERFOOTER; - HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; }; @@ -354,7 +348,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_ARRANGEMENU ; - HelpID = SID_ARRANGEMENU ; Command = ".uno:ArrangeMenu" ; Text [ en-US ] = "~Arrange" ; SubMenu = Menu @@ -368,13 +361,13 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_FRAME_UP ; - HelpID = SID_FRAME_UP ; + HelpId = ".uno:ObjectForwardOne"; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { Identifier = SID_FRAME_DOWN ; - HelpID = SID_FRAME_DOWN ; + HelpId = ".uno:ObjectBackOne"; Text [ en-US ] = "Send Back~ward" ; }; MenuItem @@ -443,7 +436,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_RESIZING ; Command = ".uno:ObjectResize" ; - HelpID = SID_OBJECT_RESIZING ; Text [ en-US ] = "~Object Resizing" ; Text [ x-comment ] = " "; SubMenu = Menu @@ -454,7 +446,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_SMALLESTWIDTH ; Command = ".uno:SmallestWidth" ; - HelpID = SID_OBJECT_SMALLESTWIDTH ; Text [ en-US ] = "~Fit to smallest width" ; Text [ x-comment ] = " "; }; @@ -462,7 +453,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTWIDTH ; Command = ".uno:GreatestWidth" ; - HelpID = SID_OBJECT_GREATESTWIDTH ; Text [ en-US ] = "~Fit to greatest width" ; Text [ x-comment ] = " "; }; @@ -474,7 +464,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_SMALLESTHEIGHT ; Command = ".uno:SmallestHeight" ; - HelpID = SID_OBJECT_SMALLESTHEIGHT ; Text [ en-US ] = "~Fit to smallest height" ; Text [ x-comment ] = " "; }; @@ -482,7 +471,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTHEIGHT ; Command = ".uno:GreatestHeight" ; - HelpID = SID_OBJECT_GREATESTHEIGHT ; Text [ en-US ] = "~Fit to greatest height" ; Text [ x-comment ] = " "; }; @@ -498,7 +486,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_MENU ; Command = ".uno:SectionShrinkMenu" ; - HelpID = SID_SECTION_SHRINK_MENU ; Text [ en-US ] = "Section" ; Text [ x-comment ] = " "; SubMenu = Menu @@ -509,7 +496,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK ; Command = ".uno:SectionShrink" ; - HelpID = SID_SECTION_SHRINK ; Text [ en-US ] = "Shrink" ; Text [ x-comment ] = " "; }; @@ -517,7 +503,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_TOP ; Command = ".uno:SectionShrinkTop" ; - HelpID = SID_SECTION_SHRINK_TOP ; Text [ en-US ] = "Shrink from top" ; Text [ x-comment ] = " "; }; @@ -525,7 +510,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_BOTTOM ; Command = ".uno:SectionShrinkBottom" ; - HelpID = SID_SECTION_SHRINK_BOTTOM ; Text [ en-US ] = "Shrink from bottom" ; Text [ x-comment ] = " "; }; @@ -539,7 +523,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_DISTRIBUTION; - HelpId = SID_DISTRIBUTION ; Command = ".uno:Distribution"; Text [ en-US ] = "Distribution..." ; }; @@ -550,7 +533,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; - HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; diff --git a/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index f7e08f34442e..3c52ed77c852 100644 --- a/reportdesign/util/hidother.src +++ b/reportdesign/util/hidother.src @@ -26,11 +26,6 @@ ************************************************************************/ #include "../inc/helpids.hrc" -#include "../inc/rptui_slotid.hrc" - -#ifndef _SBASLTID_HRC -#include <svx/svxids.hrc> -#endif hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; @@ -45,6 +40,7 @@ hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_R hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; +/* hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; @@ -54,6 +50,9 @@ hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDI hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; +hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; +*/ + hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; @@ -65,7 +64,6 @@ hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_R hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; -hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; @@ -93,15 +91,18 @@ hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; }; hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; }; hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; }; hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; }; -hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; +/* +hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; }; hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; }; +hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; +*/ + hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; }; hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; }; hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; }; hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; }; -hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; }; hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; }; @@ -110,14 +111,17 @@ hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_T hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; }; hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; }; +/* hidspecial SID_OBJECT_SMALLESTWIDTH { HelpId = SID_OBJECT_SMALLESTWIDTH; }; hidspecial SID_OBJECT_SMALLESTHEIGHT { HelpId = SID_OBJECT_SMALLESTHEIGHT; }; hidspecial SID_OBJECT_GREATESTWIDTH { HelpId = SID_OBJECT_GREATESTWIDTH; }; hidspecial SID_OBJECT_GREATESTHEIGHT { HelpId = SID_OBJECT_GREATESTHEIGHT; }; +*/ hidspecial HID_RPT_PROP_BACKTRANSPARENT { HelpId = HID_RPT_PROP_BACKTRANSPARENT; }; hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; }; +/* hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; }; hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; }; hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; @@ -129,10 +133,10 @@ hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; }; - hidspecial SID_SECTION_SHRINK { HelpId = SID_SECTION_SHRINK; }; hidspecial SID_SECTION_SHRINK_TOP { HelpId = SID_SECTION_SHRINK_TOP; }; hidspecial SID_SECTION_SHRINK_BOTTOM { HelpId = SID_SECTION_SHRINK_BOTTOM; }; +*/ hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; }; hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; }; |