Skip to content

C
core
Kaydet (Commit) 66dd3427 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert ODBC3SQL constants to scoped enum 

Change-Id: I61d2b76a32be23d238b1f50a6a76975d64d1878c
üst f2bd8b5e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 79 deletions
connectivity/source/drivers/odbc/OConnection.cxx
Dosyayı görüntüle @ 66dd3427
...@@ -90,7 +90,7 @@ void SAL_CALL OConnection::release() throw() ...@@ -90,7 +90,7 @@ void SAL_CALL OConnection::release() throw()
relase_ChildImpl(); relase_ChildImpl();
} }
oslGenericFunction OConnection::getOdbcFunction(sal_Int32 _nIndex) const oslGenericFunction OConnection::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
OSL_ENSURE(m_pDriver,"OConnection::getOdbcFunction: m_pDriver is null!"); OSL_ENSURE(m_pDriver,"OConnection::getOdbcFunction: m_pDriver is null!");
return m_pDriver->getOdbcFunction(_nIndex); return m_pDriver->getOdbcFunction(_nIndex);
......
connectivity/source/drivers/odbc/OPreparedStatement.cxx
Dosyayı görüntüle @ 66dd3427
...@@ -391,7 +391,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ ...@@ -391,7 +391,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
rDataLen = _nDataLen; rDataLen = _nDataLen;
SQLRETURN nRetcode; SQLRETURN nRetcode;
nRetcode = (*reinterpret_cast<T3SQLBindParameter>(m_pConnection->getOdbcFunction(ODBC3SQLBindParameter)))( nRetcode = (*reinterpret_cast<T3SQLBindParameter>(m_pConnection->getOdbcFunction(ODBC3SQLFunctionId::BindParameter)))(
m_aStatementHandle, m_aStatementHandle,
// checkParameterIndex guarantees this is safe // checkParameterIndex guarantees this is safe
static_cast<SQLUSMALLINT>(parameterIndex), static_cast<SQLUSMALLINT>(parameterIndex),
......
connectivity/source/drivers/odbc/OResultSet.cxx
Dosyayı görüntüle @ 66dd3427
...@@ -154,7 +154,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : ...@@ -154,7 +154,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
// We use SQLFetchScroll unconditionally in several places // We use SQLFetchScroll unconditionally in several places
// the *only* difference this makes is whether ::next() uses SQLFetchScroll or SQLFetch // the *only* difference this makes is whether ::next() uses SQLFetchScroll or SQLFetch
// so this test seems pointless // so this test seems pointless
if ( getOdbcFunction(ODBC3SQLGetFunctions) ) if ( getOdbcFunction(ODBC3SQLFunctionId::GetFunctions) )
{ {
SQLUSMALLINT nSupported = 0; SQLUSMALLINT nSupported = 0;
m_bUseFetchScroll = ( N3SQLGetFunctions(m_aConnectionHandle,SQL_API_SQLFETCHSCROLL,&nSupported) == SQL_SUCCESS && nSupported == 1 ); m_bUseFetchScroll = ( N3SQLGetFunctions(m_aConnectionHandle,SQL_API_SQLFETCHSCROLL,&nSupported) == SQL_SUCCESS && nSupported == 1 );
...@@ -847,7 +847,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st ...@@ -847,7 +847,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st
&nRealLen &nRealLen
); );
bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) ); bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLFunctionId::BulkOperations ) );
if ( bPositionByBookmark ) if ( bPositionByBookmark )
{ {
nRet = N3SQLBulkOperations( m_aStatementHandle, SQL_ADD ); nRet = N3SQLBulkOperations( m_aStatementHandle, SQL_ADD );
...@@ -914,7 +914,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st ...@@ -914,7 +914,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st
try try
{ {
bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) ); bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLFunctionId::BulkOperations ) );
if ( bPositionByBookmark ) if ( bPositionByBookmark )
{ {
getBookmark(); getBookmark();
......
connectivity/source/drivers/odbc/OResultSetMetaData.cxx
Dosyayı görüntüle @ 66dd3427
...@@ -83,7 +83,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection ...@@ -83,7 +83,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
,sal_Int32 _ident) throw(SQLException, RuntimeException) ,sal_Int32 _ident) throw(SQLException, RuntimeException)
{ {
SQLLEN nValue=0; SQLLEN nValue=0;
OTools::ThrowException(_pConnection,(*reinterpret_cast<T3SQLColAttribute>(_pConnection->getOdbcFunction(ODBC3SQLColAttribute)))(_aStatementHandle, OTools::ThrowException(_pConnection,(*reinterpret_cast<T3SQLColAttribute>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::ColAttribute)))(_aStatementHandle,
(SQLUSMALLINT)_column, (SQLUSMALLINT)_column,
(SQLUSMALLINT)_ident, (SQLUSMALLINT)_ident,
NULL, NULL,
......
connectivity/source/drivers/odbc/OTools.cxx
Dosyayı görüntüle @ 66dd3427
...@@ -139,7 +139,7 @@ void OTools::getValue( OConnection* _pConnection, ...@@ -139,7 +139,7 @@ void OTools::getValue( OConnection* _pConnection,
OSL_ENSURE(static_cast<size_t>(_nSize) >= properSize, "memory region is too small"); OSL_ENSURE(static_cast<size_t>(_nSize) >= properSize, "memory region is too small");
SQLLEN pcbValue = SQL_NULL_DATA; SQLLEN pcbValue = SQL_NULL_DATA;
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLGetData)))(_aStatementHandle, (*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetData)))(_aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
_nType, _nType,
_pValue, _pValue,
...@@ -175,7 +175,7 @@ void OTools::bindValue( OConnection* _pConnection, ...@@ -175,7 +175,7 @@ void OTools::bindValue( OConnection* _pConnection,
if (columnIndex != 0 && !_pValue) if (columnIndex != 0 && !_pValue)
{ {
*pLen = SQL_NULL_DATA; *pLen = SQL_NULL_DATA;
nRetcode = (*reinterpret_cast<T3SQLBindCol>(_pConnection->getOdbcFunction(ODBC3SQLBindCol)))(_aStatementHandle, nRetcode = (*reinterpret_cast<T3SQLBindCol>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::BindCol)))(_aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
fCType, fCType,
_pData, _pData,
...@@ -276,7 +276,7 @@ void OTools::bindValue( OConnection* _pConnection, ...@@ -276,7 +276,7 @@ void OTools::bindValue( OConnection* _pConnection,
{ {
} }
nRetcode = (*reinterpret_cast<T3SQLBindCol>(_pConnection->getOdbcFunction(ODBC3SQLBindCol)))(_aStatementHandle, nRetcode = (*reinterpret_cast<T3SQLBindCol>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::BindCol)))(_aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
fCType, fCType,
_pData, _pData,
...@@ -329,7 +329,7 @@ void OTools::ThrowException(const OConnection* _pConnection, ...@@ -329,7 +329,7 @@ void OTools::ThrowException(const OConnection* _pConnection,
// statements of this connection [what in this case will probably be the same, but the Reference // statements of this connection [what in this case will probably be the same, but the Reference
// Manual isn't totally clear in this...]. // Manual isn't totally clear in this...].
// corresponding for hdbc. // corresponding for hdbc.
SQLRETURN n = (*reinterpret_cast<T3SQLGetDiagRec>(_pConnection->getOdbcFunction(ODBC3SQLGetDiagRec)))(_nHandleType,_pContext,1, SQLRETURN n = (*reinterpret_cast<T3SQLGetDiagRec>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetDiagRec)))(_nHandleType,_pContext,1,
szSqlState, szSqlState,
&pfNativeError, &pfNativeError,
szErrorMessage,sizeof szErrorMessage - 1,&pcbErrorMsg); szErrorMessage,sizeof szErrorMessage - 1,&pcbErrorMsg);
...@@ -367,7 +367,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection, ...@@ -367,7 +367,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
while (pcbValue == SQL_NO_TOTAL || pcbValue > nMaxLen) while (pcbValue == SQL_NO_TOTAL || pcbValue > nMaxLen)
{ {
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLGetData)))( (*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetData)))(
_aStatementHandle, _aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
_fSqlType, _fSqlType,
...@@ -427,7 +427,7 @@ OUString OTools::getStringValue(OConnection* _pConnection, ...@@ -427,7 +427,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue >= nMaxSize) ) while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue >= nMaxSize) )
{ {
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLGetData)))( (*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetData)))(
_aStatementHandle, _aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
SQL_C_WCHAR, SQL_C_WCHAR,
...@@ -471,7 +471,7 @@ OUString OTools::getStringValue(OConnection* _pConnection, ...@@ -471,7 +471,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue >= nMaxLen) ) while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue >= nMaxLen) )
{ {
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLGetData)))( (*reinterpret_cast<T3SQLGetData>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetData)))(
_aStatementHandle, _aStatementHandle,
(SQLUSMALLINT)columnIndex, (SQLUSMALLINT)columnIndex,
SQL_C_CHAR, SQL_C_CHAR,
...@@ -519,7 +519,7 @@ void OTools::GetInfo(OConnection* _pConnection, ...@@ -519,7 +519,7 @@ void OTools::GetInfo(OConnection* _pConnection,
char aValue[512]; char aValue[512];
SQLSMALLINT nValueLen=0; SQLSMALLINT nValueLen=0;
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLGetInfo)))(_aConnectionHandle,_nInfo,aValue,(sizeof aValue)-1,&nValueLen), (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,aValue,(sizeof aValue)-1,&nValueLen),
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface); _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
_rValue = OUString(aValue,nValueLen,_nTextEncoding); _rValue = OUString(aValue,nValueLen,_nTextEncoding);
...@@ -534,7 +534,7 @@ void OTools::GetInfo(OConnection* _pConnection, ...@@ -534,7 +534,7 @@ void OTools::GetInfo(OConnection* _pConnection,
SQLSMALLINT nValueLen; SQLSMALLINT nValueLen;
_rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLGetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface); _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
} }
...@@ -547,7 +547,7 @@ void OTools::GetInfo(OConnection* _pConnection, ...@@ -547,7 +547,7 @@ void OTools::GetInfo(OConnection* _pConnection,
SQLSMALLINT nValueLen; SQLSMALLINT nValueLen;
_rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLGetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface); _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
} }
...@@ -560,7 +560,7 @@ void OTools::GetInfo(OConnection* _pConnection, ...@@ -560,7 +560,7 @@ void OTools::GetInfo(OConnection* _pConnection,
SQLSMALLINT nValueLen; SQLSMALLINT nValueLen;
_rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLGetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface); _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
} }
...@@ -572,7 +572,7 @@ void OTools::GetInfo(OConnection* _pConnection, ...@@ -572,7 +572,7 @@ void OTools::GetInfo(OConnection* _pConnection,
{ {
SQLSMALLINT nValueLen; SQLSMALLINT nValueLen;
OTools::ThrowException(_pConnection, OTools::ThrowException(_pConnection,
(*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLGetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface); _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
} }
......
connectivity/source/inc/odbc/OConnection.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <connectivity/CommonTools.hxx> #include <connectivity/CommonTools.hxx>
#include "TConnection.hxx" #include "TConnection.hxx"
#include "OTypeInfo.hxx" #include "OTypeInfo.hxx"
#include "OTools.hxx"
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include "AutoRetrievingBase.hxx" #include "AutoRetrievingBase.hxx"
#include <osl/module.h> #include <osl/module.h>
...@@ -83,7 +84,7 @@ namespace connectivity ...@@ -83,7 +84,7 @@ namespace connectivity
OConnection* cloneConnection(); // creates a new connection OConnection* cloneConnection(); // creates a new connection
public: public:
oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const;
SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver);
......
connectivity/source/inc/odbc/ODatabaseMetaData.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -61,7 +61,7 @@ namespace connectivity ...@@ -61,7 +61,7 @@ namespace connectivity
public: public:
inline OConnection* getOwnConnection() const { return m_pConnection; } inline OConnection* getOwnConnection() const { return m_pConnection; }
inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
return m_pConnection->getOdbcFunction(_nIndex); return m_pConnection->getOdbcFunction(_nIndex);
} }
......
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -122,7 +122,7 @@ namespace connectivity ...@@ -122,7 +122,7 @@ namespace connectivity
ODatabaseMetaDataResultSet(OConnection* _pConnection); ODatabaseMetaDataResultSet(OConnection* _pConnection);
inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
return m_pConnection->getOdbcFunction(_nIndex); return m_pConnection->getOdbcFunction(_nIndex);
} }
......
connectivity/source/inc/odbc/ODriver.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "odbc/odbcbasedllapi.hxx" #include "odbc/odbcbasedllapi.hxx"
#include <connectivity/CommonTools.hxx> #include <connectivity/CommonTools.hxx>
#include <osl/module.h> #include <osl/module.h>
#include "OTools.hxx"
namespace connectivity namespace connectivity
{ {
...@@ -54,7 +55,7 @@ namespace connectivity ...@@ -54,7 +55,7 @@ namespace connectivity
ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
// only possibility to get the odbc functions // only possibility to get the odbc functions
virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const = 0; virtual oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const = 0;
// OComponentHelper // OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XInterface // XInterface
......
connectivity/source/inc/odbc/OResultSet.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -221,7 +221,7 @@ namespace connectivity ...@@ -221,7 +221,7 @@ namespace connectivity
void construct(); void construct();
inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
return m_pStatement->getOdbcFunction(_nIndex); return m_pStatement->getOdbcFunction(_nIndex);
} }
......
connectivity/source/inc/odbc/OResultSetMetaData.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -80,7 +80,7 @@ namespace connectivity ...@@ -80,7 +80,7 @@ namespace connectivity
,sal_Int32 column) ,sal_Int32 column)
throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
return m_pConnection->getOdbcFunction(_nIndex); return m_pConnection->getOdbcFunction(_nIndex);
} }
......
connectivity/source/inc/odbc/OStatement.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -152,7 +152,7 @@ namespace connectivity ...@@ -152,7 +152,7 @@ namespace connectivity
OStatement_Base(OConnection* _pConnection ); OStatement_Base(OConnection* _pConnection );
using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{ {
return m_pConnection->getOdbcFunction(_nIndex); return m_pConnection->getOdbcFunction(_nIndex);
} }
......
connectivity/source/inc/odbc/OTools.hxx
Dosyayı görüntüle @ 66dd3427
...@@ -30,60 +30,63 @@ ...@@ -30,60 +30,63 @@
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <rtl/textenc.h> #include <rtl/textenc.h>
#define ODBC3SQLAllocHandle 1 enum class ODBC3SQLFunctionId
#define ODBC3SQLConnect 2 {
#define ODBC3SQLDriverConnect 3 AllocHandle = 1,
#define ODBC3SQLBrowseConnect 4 Connect = 2,
#define ODBC3SQLDataSources 5 DriverConnect = 3,
#define ODBC3SQLDrivers 6 BrowseConnect = 4,
#define ODBC3SQLGetInfo 7 DataSources = 5,
#define ODBC3SQLGetFunctions 8 Drivers = 6,
#define ODBC3SQLGetTypeInfo 9 GetInfo = 7,
#define ODBC3SQLSetConnectAttr 10 GetFunctions = 8,
#define ODBC3SQLGetConnectAttr 11 GetTypeInfo = 9,
#define ODBC3SQLSetEnvAttr 12 SetConnectAttr = 10,
#define ODBC3SQLGetEnvAttr 13 GetConnectAttr = 11,
#define ODBC3SQLSetStmtAttr 14 SetEnvAttr = 12,
#define ODBC3SQLGetStmtAttr 15 GetEnvAttr = 13,
#define ODBC3SQLPrepare 16 SetStmtAttr = 14,
#define ODBC3SQLBindParameter 17 GetStmtAttr = 15,
#define ODBC3SQLSetCursorName 18 Prepare = 16,
#define ODBC3SQLExecute 19 BindParameter = 17,
#define ODBC3SQLExecDirect 20 SetCursorName = 18,
#define ODBC3SQLDescribeParam 21 Execute = 19,
#define ODBC3SQLNumParams 22 ExecDirect = 20,
#define ODBC3SQLParamData 23 DescribeParam = 21,
#define ODBC3SQLPutData 24 NumParams = 22,
#define ODBC3SQLRowCount 25 ParamData = 23,
#define ODBC3SQLNumResultCols 26 PutData = 24,
#define ODBC3SQLDescribeCol 27 RowCount = 25,
#define ODBC3SQLColAttribute 28 NumResultCols = 26,
#define ODBC3SQLBindCol 29 DescribeCol = 27,
#define ODBC3SQLFetch 30 ColAttribute = 28,
#define ODBC3SQLFetchScroll 31 BindCol = 29,
#define ODBC3SQLGetData 32 Fetch = 30,
#define ODBC3SQLSetPos 33 FetchScroll = 31,
#define ODBC3SQLBulkOperations 34 GetData = 32,
#define ODBC3SQLMoreResults 35 SetPos = 33,
#define ODBC3SQLGetDiagRec 36 BulkOperations = 34,
#define ODBC3SQLColumnPrivileges 37 MoreResults = 35,
#define ODBC3SQLColumns 38 GetDiagRec = 36,
#define ODBC3SQLForeignKeys 39 ColumnPrivileges = 37,
#define ODBC3SQLPrimaryKeys 40 Columns = 38,
#define ODBC3SQLProcedureColumns 41 ForeignKeys = 39,
#define ODBC3SQLProcedures 42 PrimaryKeys = 40,
#define ODBC3SQLSpecialColumns 43 ProcedureColumns = 41,
#define ODBC3SQLStatistics 44 Procedures = 42,
#define ODBC3SQLTablePrivileges 45 SpecialColumns = 43,
#define ODBC3SQLTables 46 Statistics = 44,
#define ODBC3SQLFreeStmt 47 TablePrivileges = 45,
#define ODBC3SQLCloseCursor 48 Tables = 46,
#define ODBC3SQLCancel 49 FreeStmt = 47,
#define ODBC3SQLEndTran 50 CloseCursor = 48,
#define ODBC3SQLDisconnect 51 Cancel = 49,
#define ODBC3SQLFreeHandle 52 EndTran = 50,
#define ODBC3SQLGetCursorName 53 Disconnect = 51,
#define ODBC3SQLNativeSql 54 FreeHandle = 52,
GetCursorName = 53,
NativeSql = 54,
};
namespace connectivity namespace connectivity
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment