Tag: cws_src680_dba27 User: fs Date: 05/03/18 00:09:50 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx, databasedocument.cxx
Log: #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.58.6.1 Delta lines: +6 -6 ------------------- --- datasource.cxx 10 Mar 2005 16:34:20 -0000 1.58 +++ datasource.cxx 18 Mar 2005 08:09:47 -0000 1.58.6.1 @@ -2,9 +2,9 @@ * * $RCSfile: datasource.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.58.6.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:34:20 $ + * last change: $Author: fs $ $Date: 2005/03/18 08:09:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -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() ) { File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.14&r2=1.14.6.1 Delta lines: +4 -6 ------------------- --- databasedocument.cxx 10 Mar 2005 16:33:50 -0000 1.14 +++ databasedocument.cxx 18 Mar 2005 08:09:48 -0000 1.14.6.1 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.6.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:33:50 $ + * last change: $Author: fs $ $Date: 2005/03/18 08:09:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,8 +292,6 @@ m_pImpl->getStorage(); - Reference<XDataSource> xDs = m_pImpl->getDataSource(); - try { static ::rtl::OUString s_sStatusIndicator(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator")); @@ -535,7 +533,7 @@ if ( !xStorage.is() ) throw IOException(); - if ( m_pImpl->m_sConnectURL.compareToAscii("sdbc:embedded:",14) == 0 ) + if ( m_pImpl->isEmbeddedDatabase() ) m_pImpl->clearConnections(); m_pImpl->commitEmbeddedStorage(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
