User: ihi Date: 2007-11-21 16:10:18+0000 Modified: dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: INTEGRATION: CWS dba24c (1.35.40); FILE MERGED 2007/10/30 12:57:47 oj 1.35.40.3: #i81043# impl new type access 2007 2007/10/29 22:44:10 fs 1.35.40.2: merging changes from CWS dba24b herein, to not wait for later resync 2007/10/03 12:20:48 fs 1.35.40.1: correctly recognize macb File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.36&r2=1.37 Delta lines: +14 -2 -------------------- --- dsntypes.cxx 2007-11-01 15:25:16+0000 1.36 +++ dsntypes.cxx 2007-11-21 16:10:16+0000 1.37 @@ -286,6 +286,7 @@ } break; case DST_MSACCESS: + case DST_MSACCESS_2007: { ::rtl::OUString sNewFileName; if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None ) @@ -308,6 +309,7 @@ case DST_FLAT: case DST_CALC: case DST_MSACCESS: + case DST_MSACCESS_2007: return sal_True; case DST_USERDEFINE1: @@ -351,6 +353,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MSACCESS_2007: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: @@ -375,6 +378,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MSACCESS_2007: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MOZILLA: @@ -443,7 +447,13 @@ { nSeparator = _rDsn.Search((sal_Unicode)':', nSeparator + 1); if (STRING_NOTFOUND != nSeparator && _rDsn.EqualsIgnoreCaseAscii("sdbc:ado:access",0, nSeparator) ) + { + nSeparator = _rDsn.Search((sal_Unicode)';', nSeparator + 1); + if (STRING_NOTFOUND != nSeparator && _rDsn.EqualsIgnoreCaseAscii("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0",0, nSeparator) ) + return DST_MSACCESS_2007; + return DST_MSACCESS; + } return DST_ADO; } if (_rDsn.EqualsIgnoreCaseAscii("sdbc:flat:", 0, nSeparator)) @@ -475,6 +485,8 @@ return DST_EVOLUTION; if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator)) return DST_KAB; + if (_rDsn.EqualsIgnoreCaseAscii("macab", nSeparator,_rDsn.Len() - nSeparator)) + return DST_MACAB; } // find third : --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
