User: kz Date: 2006/12/13 08:47:35 Modified: dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx
Log: INTEGRATION: CWS dba22ui (1.9.12); FILE MERGED 2006/12/05 09:47:53 fs 1.9.12.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former 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.9&r2=1.10 Delta lines: +17 -16 --------------------- --- AdvancedPageDlg.cxx 17 Sep 2006 07:04:08 -0000 1.9 +++ AdvancedPageDlg.cxx 13 Dec 2006 16:47:32 -0000 1.10 @@ -119,36 +119,37 @@ { case DST_DBASE: case DST_FLAT: - AddTabPage(PAGE_DS_PROPERTIES_FILE, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateFileDsProperties,NULL); + AddTabPage( PAGE_DS_PROPERTIES_FILE, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateFileSettingsPage, NULL ); break; + case DST_MSACCESS: - AddTabPage(PAGE_DS_PROPERTIES_ACCESS, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateAccessDsProperties,NULL); + AddTabPage( PAGE_DS_PROPERTIES_ACCESS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAccessSettingsPage, NULL ); break; + case DST_ADABAS: - AddTabPage(PAGE_DS_PROPERTIES_2, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::Create2DsProperties,NULL); - break; - case DST_ADO: - AddTabPage(PAGE_DS_PROPERTIES_3, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::Create3DsProperties,NULL); + AddTabPage( PAGE_DS_ADABAS_SETTINGS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateAdabasSettingsPage, NULL ); break; - case DST_ODBC: - AddTabPage(PAGE_GENERATED_VALUES, String(ResId(STR_GENERATED_VALUE)), ODriversSettings::CreateGeneratedValues,NULL); - AddTabPage(PAGE_DS_PROPERTIES_4, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::Create4DsProperties,NULL); + case DST_ADO: + AddTabPage( PAGE_DS_ADO_SETTINGS, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateADOSettingsPage,NULL); break; case DST_MYSQL_ODBC: case DST_MYSQL_JDBC: - AddTabPage(PAGE_DS_PROPERTIES_ENABLEOJ, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateOJDsProperties,NULL); + AddTabPage( PAGE_DS_MYSQL_SETTINGS, String( ResId( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateMySQLSettingsPage, NULL ); break; + case DST_LDAP: case DST_CALC: case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: case DST_KAB: - case DST_OUTLOOK : + case DST_OUTLOOK: case DST_OUTLOOKEXP: break; + + case DST_ODBC: case DST_JDBC: case DST_ORACLE_JDBC: case DST_USERDEFINE1: /// first user defined driver @@ -162,8 +163,8 @@ case DST_USERDEFINE9: case DST_USERDEFINE10: default: - AddTabPage(PAGE_GENERATED_VALUES, String(ResId(STR_GENERATED_VALUE)), ODriversSettings::CreateGeneratedValues,NULL); - AddTabPage(PAGE_DS_PROPERTIES_4, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::Create4DsProperties,NULL); + 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 ); break; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
