User: kz Date: 2008-03-05 17:05:52+0000 Modified: dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: INTEGRATION: CWS dba30a (1.38.34); FILE MERGED 2008/02/14 08:37:49 oj 1.38.34.1: #i86088# add url handling for sdbc:mysqlc: 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.38&r2=1.39 Delta lines: +5 -2 ------------------- --- dsntypes.cxx 2007-11-27 12:27:59+0000 1.38 +++ dsntypes.cxx 2008-03-05 17:05:49+0000 1.39 @@ -276,6 +276,7 @@ _rsHostname = sUrl.GetToken(0,':'); _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':'); break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: { lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber); @@ -357,6 +358,7 @@ case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: + case DST_MYSQL_NATIVE: case DST_ORACLE_JDBC: case DST_LDAP: case DST_JDBC: @@ -385,6 +387,7 @@ case DST_THUNDERBIRD: bEnableBrowseButton = TRUE; break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: case DST_ORACLE_JDBC: case DST_LDAP: @@ -460,6 +463,8 @@ return DST_FLAT; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:calc:", 0, nSeparator)) return DST_CALC; + if ( ( 11 <= nSeparator) && _rDsn.EqualsIgnoreCaseAscii("sdbc:mysqlc:", 0, nSeparator)) + return DST_MYSQL_NATIVE; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:embedded:hsqldb", 0, _rDsn.Len())) return DST_EMBEDDED_HSQLDB; @@ -502,8 +507,6 @@ if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mysql:jdbc", 0, nSeparator)) return DST_MYSQL_JDBC; - - DBG_ERROR("ODsnTypeCollection::implDetermineType : unrecognized data source type !"); return DST_UNKNOWN; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
