Tag: cws_src680_mdbdriver02 User: fridrich_strba Date: 05/11/03 02:47:55 Modified: /dba/dbaccess/source/ui/dlg/ AdabasStatDlg.cxx, AdvancedPageDlg.cxx, ConnectionHelper.cxx, ConnectionPage.cxx, DbAdminImpl.cxx, DriverSettings.cxx, dbwiz.cxx, dbwizsetup.cxx /dba/dbaccess/source/ui/inc/ dsntypes.hxx /dba/dbaccess/source/ui/misc/ dbumiscres.hrc, dbumiscres.src, dsntypes.cxx
Log: Issue number: N/A Submitted by: fridrich_strba Reviewed by: fridrich_strba Add STR_MDBFILE and DST_MDBFILE although still recycling the dialogues of MSACCESS ADO based driver for Win32 File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdabasStatDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdabasStatDlg.cxx?r1=1.7&r2=1.7.36.1 Delta lines: +4 -3 ------------------- --- AdabasStatDlg.cxx 23 Sep 2005 12:24:44 -0000 1.7 +++ AdabasStatDlg.cxx 3 Nov 2005 10:47:49 -0000 1.7.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdabasStatDlg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.36.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:24:44 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -121,6 +121,7 @@ case DST_DBASE: case DST_FLAT: case DST_MSACCESS: + case DST_MDBFILE: case DST_ADO: case DST_ODBC: case DST_MYSQL_ODBC: File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.7&r2=1.7.36.1 Delta lines: +4 -3 ------------------- --- AdvancedPageDlg.cxx 23 Sep 2005 12:25:00 -0000 1.7 +++ AdvancedPageDlg.cxx 3 Nov 2005 10:47:49 -0000 1.7.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.36.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:25:00 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,6 +119,7 @@ AddTabPage(PAGE_DS_PROPERTIES_FILE, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateFileDsProperties,NULL); break; case DST_MSACCESS: + case DST_MDBFILE: AddTabPage(PAGE_DS_PROPERTIES_ACCESS, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateAccessDsProperties,NULL); break; case DST_ADABAS: File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.8&r2=1.8.34.1 Delta lines: +7 -4 ------------------- --- ConnectionHelper.cxx 23 Sep 2005 12:25:19 -0000 1.8 +++ ConnectionHelper.cxx 3 Nov 2005 10:47:50 -0000 1.8.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.34.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:25:19 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,6 +318,7 @@ } break; case DST_MSACCESS: + case DST_MDBFILE: { ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb")); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); @@ -805,6 +806,7 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) + || (DST_MDBFILE == m_eType) || (DST_CALC == m_eType) ) switch (_rNEvt.GetType()) { @@ -926,6 +928,7 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) + || (DST_MDBFILE == m_eType) || (DST_CALC == m_eType) ) { if ((sURL != sOldPath) && (0 != sURL.Len())) @@ -935,7 +938,7 @@ OFileNotation aTransformer(sURL); sURL = aTransformer.get(OFileNotation::N_URL); - if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) ) + if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) || (DST_MDBFILE == m_eType) ) { // #106016# -------------------------- if( pathExists(sURL, sal_True) == PATH_NOT_EXIST ) { File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.12&r2=1.12.34.1 Delta lines: +4 -3 ------------------- --- ConnectionPage.cxx 23 Sep 2005 12:25:48 -0000 1.12 +++ ConnectionPage.cxx 3 Nov 2005 10:47:50 -0000 1.12.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.34.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:25:48 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,6 +268,7 @@ m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); break; case DST_MSACCESS: + case DST_MDBFILE: m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE))); m_aET_Connection.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.11&r2=1.11.42.1 Delta lines: +4 -3 ------------------- --- DbAdminImpl.cxx 8 Sep 2005 14:47:06 -0000 1.11 +++ DbAdminImpl.cxx 3 Nov 2005 10:47:50 -0000 1.11.42.1 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.42.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:47:06 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -526,6 +526,7 @@ } break; case DST_MSACCESS: + case DST_MDBFILE: { ::rtl::OUString sFileName = pCollection->cutPrefix(pUrlItem->GetValue()); ::rtl::OUString sNewFileName; File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.4&r2=1.4.44.1 Delta lines: +4 -3 ------------------- --- DriverSettings.cxx 8 Sep 2005 14:47:47 -0000 1.4 +++ DriverSettings.cxx 3 Nov 2005 10:47:50 -0000 1.4.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:47:47 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ _rDetailsIds.push_back(DSID_DOSLINEENDS); break; case DST_MSACCESS: + case DST_MDBFILE: _rDetailsIds.push_back(DSID_SQL92CHECK); _rDetailsIds.push_back(DSID_ENABLEOUTERJOIN); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.8&r2=1.8.44.1 Delta lines: +4 -3 ------------------- --- dbwiz.cxx 8 Sep 2005 14:57:15 -0000 1.8 +++ dbwiz.cxx 3 Nov 2005 10:47:51 -0000 1.8.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.44.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:57:15 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -219,6 +219,7 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_MSACCESS: + case DST_MDBFILE: case DST_JDBC: case DST_CALC: nNextState = WZS_INVALID_STATE; File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.13&r2=1.13.42.1 Delta lines: +9 -3 ------------------- --- dbwizsetup.cxx 8 Sep 2005 14:57:34 -0000 1.13 +++ dbwizsetup.cxx 3 Nov 2005 10:47:51 -0000 1.13.42.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.42.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:57:34 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -368,6 +368,11 @@ else declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_MDBFILE)) + declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_OUTLOOKEXP)) declarePath( OUTLOOKEXP_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -529,6 +534,7 @@ { DST_ADABAS, ADABAS_PATH }, { DST_LDAP, LDAP_PATH }, { DST_MSACCESS, MSACCESS_PATH }, + { DST_MDBFILE, MSACCESS_PATH }, { DST_OUTLOOKEXP, OUTLOOKEXP_PATH }, { DST_OUTLOOK, OUTLOOK_PATH }, { DST_MOZILLA, MOZILLA_PATH }, Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.18&r2=1.18.38.1 Delta lines: +5 -4 ------------------- --- dsntypes.hxx 8 Sep 2005 15:54:00 -0000 1.18 +++ dsntypes.hxx 3 Nov 2005 10:47:51 -0000 1.18.38.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.38.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:54:00 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,6 +75,7 @@ DST_EVOLUTION = 16, DST_EMBEDDED = 17, DST_THUNDERBIRD = 18, + DST_MDBFILE = 19, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dbumiscres.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.hrc?r1=1.7&r2=1.7.44.1 Delta lines: +5 -4 ------------------- --- dbumiscres.hrc 8 Sep 2005 16:13:11 -0000 1.7 +++ dbumiscres.hrc 3 Nov 2005 10:47:52 -0000 1.7.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.hrc,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.44.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:13:11 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,8 +57,9 @@ #define STR_EVOLUTION 16 #define STR_EMBEDDED 17 #define STR_THUNDERBIRD 18 +#define STR_MDBFILE 19 -#define STR_END STR_THUNDERBIRD + 1 +#define STR_END STR_MDBFILE + 1 #endif // _DBU_MISCRES_HRC_ File [changed]: dbumiscres.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.src?r1=1.69&r2=1.69.36.1 Delta lines: +12 -3 -------------------- --- dbumiscres.src 23 Sep 2005 14:17:42 -0000 1.69 +++ dbumiscres.src 3 Nov 2005 10:47:52 -0000 1.69.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.src,v $ * - * $Revision: 1.69 $ + * $Revision: 1.69.36.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:17:42 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,6 +79,10 @@ { Text ="sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="; }; + String STR_MDBFILE + { + Text ="sdbc:mdb:"; + }; String STR_FLAT { Text ="sdbc:flat:"; @@ -161,6 +165,11 @@ Text[ en-US ] = "ADO"; }; String STR_MSACCESS + { + Text [ de ] = "Microsoft Access"; + Text[ en-US ] = "Microsoft Access"; + }; + String STR_MDBFILE { Text [ de ] = "Microsoft Access"; Text[ en-US ] = "Microsoft Access"; File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.27&r2=1.27.36.1 Delta lines: +12 -6 -------------------- --- dsntypes.cxx 23 Sep 2005 12:39:42 -0000 1.27 +++ dsntypes.cxx 3 Nov 2005 10:47:52 -0000 1.27.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.27.36.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:39:42 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -330,6 +330,7 @@ } break; case DST_MSACCESS: + case DST_MDBFILE: { ::rtl::OUString sNewFileName; if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None ) @@ -355,6 +356,7 @@ case DST_FLAT: case DST_CALC: case DST_MSACCESS: + case DST_MDBFILE: return sal_True; case DST_USERDEFINE1: @@ -395,6 +397,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MDBFILE: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: @@ -419,6 +422,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MDBFILE: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MOZILLA: @@ -469,6 +473,7 @@ return sal_True; break; case DST_MSACCESS: + case DST_MDBFILE: case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: @@ -519,7 +524,8 @@ return DST_ODBC; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:dbase", 0, nSeparator)) return DST_DBASE; - + if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mdb:", 0, nSeparator)) + return DST_MDBFILE; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:ado:", 0, nSeparator)) { nSeparator = _rDsn.Search((sal_Unicode)':', nSeparator + 1); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
