Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:22:16+0000 Log: RESYNC: (1.23-1.25); FILE MERGED
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.13.6.8&r2=1.13.6.9 Delta lines: +22 -26 --------------------- --- dbwizsetup.cxx 2007-02-20 15:48:27+0000 1.13.6.8 +++ dbwizsetup.cxx 2007-06-04 18:22:13+0000 1.13.6.9 @@ -282,7 +282,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 ) @@ -291,26 +291,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 @@ -507,7 +507,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: @@ -676,16 +676,6 @@ // extract all relevant data from the property set of the data source m_pImpl->translateProperties(_rxDatasource, *getWriteOutputSet()); } -//------------------------------------------------------------------------- -ODbTypeWizDialogSetup::ApplyResult ODbTypeWizDialogSetup::implApplyChanges() -{ - if ( !m_pImpl->saveChanges(*m_pOutSet) ) - return AR_KEEP; - - m_bApplied = sal_True; - - return AR_LEAVE_MODIFIED; -} // ----------------------------------------------------------------------------- const SfxItemSet* ODbTypeWizDialogSetup::getOutputSet() const { @@ -949,6 +939,12 @@ } //------------------------------------------------------------------------- +void ODbTypeWizDialogSetup::enableConfirmSettings( bool _bEnable ) +{ + (void)_bEnable; +} + +//------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { Reference< XInteractionHandler > xHandler(getORB()->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
