User: hr Date: 06/06/19 18:12:37 Modified: /dba/connectivity/source/drivers/ado/ AConnection.cxx
Log: INTEGRATION: CWS warnings01 (1.23.30); FILE MERGED 2006/04/07 20:16:29 sb 1.23.30.4: RESYNC: (1.23-1.24); FILE MERGED 2005/12/22 11:44:32 fs 1.23.30.3: #i57457# warning-free code 2005/11/16 12:58:51 fs 1.23.30.2: #i57457# warning free code 2005/11/07 14:43:06 fs 1.23.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: AConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AConnection.cxx?r1=1.24&r2=1.25 Delta lines: +14 -10 --------------------- --- AConnection.cxx 29 Mar 2006 12:14:19 -0000 1.24 +++ AConnection.cxx 20 Jun 2006 01:12:34 -0000 1.25 @@ -92,8 +92,7 @@ //------------------------------------------------------------------------------ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection"); // -------------------------------------------------------------------------------- -OConnection::OConnection(const ::rtl::OUString& url, const Sequence< PropertyValue >& info, - ODriver* _pDriver) throw(SQLException, RuntimeException) +OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_bClosed(sal_False), m_xMetaData(NULL), @@ -327,7 +326,8 @@ checkDisposed(OConnection_BASE::rBHelper.bDisposed); - m_pAdoConnection->put_Mode(adModeRead); + + m_pAdoConnection->put_Mode(readOnly ? adModeRead : adModeReadWrite); ADOS::ThrowException(*m_pAdoConnection,*this); } // -------------------------------------------------------------------------------- @@ -429,8 +429,9 @@ return NULL; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { + ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } // -------------------------------------------------------------------------------- // XCloseable @@ -481,7 +482,7 @@ aInfo->eType = (DataTypeEnum)(sal_Int32)ADOS::getField(pRecordset,nPos++).get_Value(); if ( aInfo->eType == adWChar && aInfo->aSimpleType.aTypeName == s_sVarChar ) aInfo->eType = adVarWChar; - aInfo->aSimpleType.nType = ADOS::MapADOType2Jdbc(static_cast<DataTypeEnum>(aInfo->eType)); + aInfo->aSimpleType.nType = (sal_Int16)ADOS::MapADOType2Jdbc(static_cast<DataTypeEnum>(aInfo->eType)); aInfo->aSimpleType.nPrecision = ADOS::getField(pRecordset,nPos++).get_Value(); aInfo->aSimpleType.aLiteralPrefix = ADOS::getField(pRecordset,nPos++).get_Value(); aInfo->aSimpleType.aLiteralSuffix = ADOS::getField(pRecordset,nPos++).get_Value(); @@ -514,7 +515,10 @@ // m_aTables.disposing(); for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - ::comphelper::disposeComponent(i->get()); + { + Reference< XInterface > xStatement( i->get() ); + ::comphelper::disposeComponent( xStatement ); + } m_aStatements.clear(); m_bClosed = sal_True; @@ -541,7 +545,7 @@ { return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? - (sal_Int64)this + reinterpret_cast< sal_Int64 >( this ) : OConnection_BASE::getSomething(rId); } @@ -581,9 +585,9 @@ OExtendedTypeInfo* pInfo = aIter->second; #ifdef DBG_UTIL ::rtl::OUString sDBTypeName = pInfo->aSimpleType.aTypeName; - sal_Int32 nDBTypePrecision = pInfo->aSimpleType.nPrecision; - sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; - sal_Int32 nAdoType = pInfo->eType; + sal_Int32 nDBTypePrecision = pInfo->aSimpleType.nPrecision; (void)nDBTypePrecision; + sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; (void)nDBTypeScale; + sal_Int32 nAdoType = pInfo->eType; (void)nAdoType; #endif if ( ( !_sTypeName.getLength() || (pInfo->aSimpleType.aTypeName.equalsIgnoreAsciiCase(_sTypeName)) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
