User: vg Date: 05/03/23 01:46:40 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx
Log: INTEGRATION: CWS dba26 (1.58.4); FILE MERGED 2005/03/18 08:16:55 fs 1.58.4.1: #i45153# +isEmbeddedDatabase File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.58&r2=1.59 Delta lines: +3 -3 ------------------- --- datasource.cxx 10 Mar 2005 16:34:20 -0000 1.58 +++ datasource.cxx 23 Mar 2005 09:46:37 -0000 1.59 @@ -378,8 +378,8 @@ { ::comphelper::disposeComponent(aFind->second->second.xMasterConnection); m_aConnections.erase(aFind->second); - m_aSharedConnection.erase(aFind); } + m_aSharedConnection.erase(aFind); } } @@ -730,7 +730,7 @@ { Sequence< PropertyValue > aDriverInfo = lcl_filterDriverProperties(xDriver,m_pImpl->m_sConnectURL,m_pImpl->m_aInfo); - if ( m_pImpl->m_sConnectURL.compareToAscii("sdbc:embedded:",14) == 0 ) + if ( m_pImpl->isEmbeddedDatabase() ) { sal_Int32 nCount = aDriverInfo.getLength(); aDriverInfo.realloc(nCount + 2 ); @@ -1086,7 +1086,7 @@ { Reference< XConnection > xConn; Reference< XConnection > xSdbcConn = buildLowLevelConnection(user, password); - DBG_ASSERT( xSdbcConn.is(), "ODatabaseSource::getConnection: invalid return value of buildLowLevelConnection!" ); + DBG_ASSERT( xSdbcConn.is(), "ODatabaseSource::buildIsolatedConnection: invalid return value of buildLowLevelConnection!" ); // buildLowLevelConnection is expected to always succeed if ( xSdbcConn.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
