User: hr Date: 06/06/19 18:54:38 Modified: /dba/connectivity/source/drivers/odbc/ OConnection.cxx
Log: INTEGRATION: CWS warnings01 (1.32.26); FILE MERGED 2006/04/07 20:24:28 sb 1.32.26.5: RESYNC: (1.33-1.35); FILE MERGED 2006/01/25 20:58:45 sb 1.32.26.4: RESYNC: (1.32-1.33); FILE MERGED 2005/11/21 10:07:55 fs 1.32.26.3: #i57457# warning-free code on unx* 2005/11/16 12:59:19 fs 1.32.26.2: #i57457# warning free code 2005/11/07 14:44:01 fs 1.32.26.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OConnection.cxx?r1=1.35&r2=1.36 Delta lines: +46 -40 --------------------- --- OConnection.cxx 29 Mar 2006 12:20:13 -0000 1.35 +++ OConnection.cxx 20 Jun 2006 01:54:35 -0000 1.36 @@ -74,6 +74,12 @@ #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif using namespace connectivity::odbc; using namespace connectivity; @@ -87,13 +93,13 @@ // -------------------------------------------------------------------------------- OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) - ,m_pDriverHandleCopy(_pDriverHandle) + ,m_xMetaData(NULL) ,m_pDriver(_pDriver) + ,m_pDriverHandleCopy(_pDriverHandle) + ,m_nStatementCount(0) ,m_bClosed(sal_True) - ,m_xMetaData(NULL) ,m_bUseCatalog(sal_False) ,m_bUseOldDateFormat(sal_False) - ,m_nStatementCount(0) ,m_bParameterSubstitution(sal_False) ,m_bIgnoreDriverPrivileges(sal_False) ,m_bPreventGetVersionColumns(sal_False) @@ -119,7 +125,7 @@ relase_ChildImpl(); } // ----------------------------------------------------------------------------- -void* OConnection::getOdbcFunction(sal_Int32 _nIndex) const +oslGenericFunction OConnection::getOdbcFunction(sal_Int32 _nIndex) const { OSL_ENSURE(m_pDriver,"OConnection::getOdbcFunction: m_pDriver is null!"); return m_pDriver->getOdbcFunction(_nIndex); @@ -147,7 +153,7 @@ // Verbindung aufbauen #ifdef LINUX - + OSL_UNUSED( bSilent ); nSQLRETURN = N3SQLDriverConnect(m_aConnectionHandle, NULL, szConnStrIn, @@ -336,11 +342,9 @@ return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(OConnection_BASE::rBHelper.bDisposed); - + ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } // -------------------------------------------------------------------------------- @@ -427,7 +431,7 @@ OTools::ThrowException(this, - N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_ACCESS_MODE,(SQLPOINTER)readOnly,SQL_IS_INTEGER), + N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_ACCESS_MODE,reinterpret_cast< SQLPOINTER >( readOnly ),SQL_IS_INTEGER), m_aConnectionHandle,SQL_HANDLE_DBC,*this); } // -------------------------------------------------------------------------------- @@ -504,8 +508,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 @@ -686,6 +691,7 @@ SQLHANDLE aStatementHandle = SQL_NULL_HANDLE; SQLRETURN nRetcode = N3SQLAllocHandle(SQL_HANDLE_STMT,pConnectionTemp->getConnection(),&aStatementHandle); + OSL_UNUSED( nRetcode ); ++m_nStatementCount; if(bNew) m_aConnections.insert(::std::map< SQLHANDLE,OConnection*>::value_type(aStatementHandle,pConnectionTemp)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
