User: rt Date: 2007/04/26 00:58:43 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: INTEGRATION: CWS residcleanup (1.23.12); FILE MERGED 2007/02/26 22:58:47 pl 1.23.12.1: #i74635# no more ResMgr default File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.23&r2=1.24 Delta lines: +16 -16 --------------------- --- dbwizsetup.cxx 15 Jan 2007 14:33:46 -0000 1.23 +++ dbwizsetup.cxx 26 Apr 2007 07:58:41 -0000 1.24 @@ -285,7 +285,7 @@ ) :svt::RoadmapWizard( _pParent, ModuleRes(DLG_DATABASE_WIZARD), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP, - ResId( STR_ROADMAPHEADER ), sal_True) + ModuleRes( STR_ROADMAPHEADER ), sal_True) , m_pOutSet(NULL) , m_eType( DST_UNKNOWN ) @@ -294,26 +294,26 @@ , m_bApplied(sal_False) , m_bUIEnabled( sal_True ) , m_bIsConnectable( sal_False) - , m_sRM_IntroText(ResId(STR_PAGETITLE_INTROPAGE)) - , m_sRM_dBaseText(ResId(STR_PAGETITLE_DBASE)) - , m_sRM_TextText(ResId(STR_PAGETITLE_TEXT)) - , m_sRM_MSAccessText(ResId(STR_PAGETITLE_MSACCESS)) - , m_sRM_LDAPText(ResId(STR_PAGETITLE_LDAP)) - , m_sRM_ADABASText(ResId(STR_PAGETITLE_ADABAS)) - , m_sRM_ADOText(ResId(STR_PAGETITLE_ADO)) - , m_sRM_JDBCText(ResId(STR_PAGETITLE_JDBC)) + , m_sRM_IntroText(ModuleRes(STR_PAGETITLE_INTROPAGE)) + , m_sRM_dBaseText(ModuleRes(STR_PAGETITLE_DBASE)) + , m_sRM_TextText(ModuleRes(STR_PAGETITLE_TEXT)) + , m_sRM_MSAccessText(ModuleRes(STR_PAGETITLE_MSACCESS)) + , m_sRM_LDAPText(ModuleRes(STR_PAGETITLE_LDAP)) + , m_sRM_ADABASText(ModuleRes(STR_PAGETITLE_ADABAS)) + , m_sRM_ADOText(ModuleRes(STR_PAGETITLE_ADO)) + , m_sRM_JDBCText(ModuleRes(STR_PAGETITLE_JDBC)) , m_pGeneralPage( NULL ) , m_pMySQLIntroPage(NULL) , m_pCollection( NULL ) { DBG_CTOR(ODbTypeWizDialogSetup,NULL); // no local resources needed anymore - m_sRM_MySQLText = String(ResId(STR_PAGETITLE_MYSQL)); - m_sRM_OracleText = String(ResId(STR_PAGETITLE_ORACLE)); - m_sRM_ODBCText = String(ResId(STR_PAGETITLE_ODBC)); - m_sRM_SpreadSheetText = String(ResId(STR_PAGETITLE_SPREADSHEET)); - m_sRM_AuthentificationText = String(ResId(STR_PAGETITLE_AUTHENTIFICATION)); - m_sRM_FinalText = String(ResId(STR_PAGETITLE_FINAL)); + m_sRM_MySQLText = String(ModuleRes(STR_PAGETITLE_MYSQL)); + m_sRM_OracleText = String(ModuleRes(STR_PAGETITLE_ORACLE)); + m_sRM_ODBCText = String(ModuleRes(STR_PAGETITLE_ODBC)); + m_sRM_SpreadSheetText = String(ModuleRes(STR_PAGETITLE_SPREADSHEET)); + m_sRM_AuthentificationText = String(ModuleRes(STR_PAGETITLE_AUTHENTIFICATION)); + m_sRM_FinalText = String(ModuleRes(STR_PAGETITLE_FINAL)); m_sWorkPath = SvtPathOptions().GetWorkPath(); pFinalPage = NULL; // extract the datasource type collection from the item set @@ -510,7 +510,7 @@ case PAGE_DBSETUPWIZARD_USERDEFINED: { LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); - sRoadmapItem = String(ResId(STR_PAGETITLE_CONNECTION)); + sRoadmapItem = String(ModuleRes(STR_PAGETITLE_CONNECTION)); } break; case PAGE_DBSETUPWIZARD_FINAL: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
