diff options
Diffstat (limited to 'connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx')
| -rw-r--r-- | connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx index adf77eca238c..3397c5c515a9 100644 --- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx @@ -86,13 +86,13 @@ OResultSetMetaData::~OResultSetMetaData() return sValue; } // ------------------------------------------------------------------------- -SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection +SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection ,SQLHANDLE _aStatementHandle ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface ,sal_Int32 _column ,sal_Int32 _ident) throw(SQLException, RuntimeException) { - SWORD nValue=0; + SQLLEN nValue=0; OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle, (SQLUSMALLINT)_column, (SQLUSMALLINT)_ident, @@ -117,22 +117,22 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE); } // ------------------------------------------------------------------------- -SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection +SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection ,SQLHANDLE _aStatementHandle ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface ,sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - SWORD nType = 0; + SQLSMALLINT nType = 0; try { - nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE); + nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE); if(nType == SQL_UNKNOWN_TYPE) - nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column, SQL_DESC_TYPE); + nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column, SQL_DESC_TYPE); } catch(SQLException& ) // in this case we have an odbc 2.0 driver { - nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE ); + nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE ); } return nType; |