Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:11:32+0000 Log: RESYNC: (1.10-1.12); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.7.4.6&r2=1.7.4.7 Delta lines: +12 -7 -------------------- --- AdvancedPageDlg.cxx 2006-12-18 16:18:12+0000 1.7.4.6 +++ AdvancedPageDlg.cxx 2007-06-04 18:11:28+0000 1.7.4.7 @@ -116,24 +116,24 @@ { case DST_DBASE: case DST_FLAT: - AddTabPage( PAGE_DS_PROPERTIES_FILE, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateFileSettingsPage, NULL ); + AddTabPage( PAGE_DS_PROPERTIES_FILE, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateFileSettingsPage, NULL ); break; case DST_MSACCESS: - AddTabPage( PAGE_DS_PROPERTIES_ACCESS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAccessSettingsPage, NULL ); + AddTabPage( PAGE_DS_PROPERTIES_ACCESS, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAccessSettingsPage, NULL ); break; case DST_ADABAS: - AddTabPage( PAGE_DS_ADABAS_SETTINGS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAdabasSettingsPage, NULL ); + AddTabPage( PAGE_DS_ADABAS_SETTINGS, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAdabasSettingsPage, NULL ); break; case DST_ADO: - AddTabPage( PAGE_DS_ADO_SETTINGS, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateADOSettingsPage,NULL); + AddTabPage( PAGE_DS_ADO_SETTINGS, String(ModuleRes(STR_DS_BEHAVIOUR)), ODriversSettings::CreateADOSettingsPage,NULL); break; case DST_MYSQL_ODBC: case DST_MYSQL_JDBC: - AddTabPage( PAGE_DS_MYSQL_SETTINGS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateMySQLSettingsPage, NULL ); + AddTabPage( PAGE_DS_MYSQL_SETTINGS, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateMySQLSettingsPage, NULL ); break; case DST_LDAP: @@ -160,8 +160,8 @@ case DST_USERDEFINE9: case DST_USERDEFINE10: default: - AddTabPage( PAGE_GENERATED_VALUES, String( ResId( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); - AddTabPage( PAGE_DS_FULL_ADVANCED_SETTINGS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateFullSettingsPage, NULL ); + AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); + AddTabPage( PAGE_DS_FULL_ADVANCED_SETTINGS, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateFullSettingsPage, NULL ); break; } @@ -244,6 +244,11 @@ SetText(_sTitle); } //------------------------------------------------------------------------- + void OAdvancedTabPageDlg::enableConfirmSettings( bool _bEnable ) + { + (void)_bEnable; + } + //------------------------------------------------------------------------- sal_Bool OAdvancedTabPageDlg::saveDatasource() { return PrepareLeaveCurrentPage(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
