diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:49:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:49:05 +0000 |
| commit | 2d7de2a32c433f99dceae3471f6350131c795f8f (patch) | |
| tree | 35fa6b11b7ea6b8679a33ded5d7b720191cc202d /connectivity/source/drivers | |
| parent | c60be39587db4ab6a8c93ea393838fd72fc12c91 (diff) | |
INTEGRATION: CWS dba24d (1.28.78); FILE MERGED
2007/11/21 12:40:39 oj 1.28.78.1: #i68854# impl TypeSettingInfo for Oracle and some clean up
Diffstat (limited to 'connectivity/source/drivers')
| -rw-r--r-- | connectivity/source/drivers/ado/AConnection.cxx | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index e8d70d90b5..6daa1ba0f1 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AConnection.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:56:26 $ + * last change: $Author: rt $ $Date: 2008-01-30 07:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,7 +95,6 @@ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.sta OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_bClosed(sal_False), - m_xMetaData(NULL), m_xCatalog(NULL), m_pDriver(_pDriver), m_pAdoConnection(NULL), @@ -148,6 +147,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV { osl_incrementInterlockedCount( &m_refCount ); + setConnectionInfo(info); + sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); ::rtl::OUString aDSN(url.copy(nLen+1)),aUID,aPWD; @@ -156,18 +157,18 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV sal_Int32 nTimeout = 20; sal_Bool bSilent = sal_True; - const PropertyValue *pBegin = info.getConstArray(); - const PropertyValue *pEnd = pBegin + info.getLength(); - for(;pBegin != pEnd;++pBegin) + const PropertyValue *pIter = info.getConstArray(); + const PropertyValue *pEnd = pIter + info.getLength(); + for(;pIter != pEnd;++pIter) { - if(!pBegin->Name.compareToAscii("Timeout")) - pBegin->Value >>= nTimeout; - else if(!pBegin->Name.compareToAscii("Silent")) - pBegin->Value >>= bSilent; - else if(!pBegin->Name.compareToAscii("user")) - pBegin->Value >>= aUID; - else if(!pBegin->Name.compareToAscii("password")) - pBegin->Value >>= aPWD; + if(!pIter->Name.compareToAscii("Timeout")) + pIter->Value >>= nTimeout; + else if(!pIter->Name.compareToAscii("Silent")) + pIter->Value >>= bSilent; + else if(!pIter->Name.compareToAscii("user")) + pIter->Value >>= aUID; + else if(!pIter->Name.compareToAscii("password")) + pIter->Value >>= aPWD; } if(m_pAdoConnection) @@ -513,13 +514,7 @@ void OConnection::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - // m_aTables.disposing(); - for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - { - Reference< XInterface > xStatement( i->get() ); - ::comphelper::disposeComponent( xStatement ); - } - m_aStatements.clear(); + OConnection_BASE::disposing(); m_bClosed = sal_True; m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); @@ -538,7 +533,6 @@ void OConnection::disposing() m_pAdoConnection = NULL; dispose_ChildImpl(); - OConnection_BASE::disposing(); } // ----------------------------------------------------------------------------- sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) |