diff options
| author | Ocke Janssen <oj@openoffice.org> | 2001-03-15 07:17:11 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2001-03-15 07:17:11 +0000 |
| commit | febb2f3ceb95f11197d8cdd646a7ac9724d59bfb (patch) | |
| tree | 106e4cdd494ef5ddd9691fb76f0835989b9dca50 | |
| parent | 466b2ac0e4e6e925713f073ac4e48ac67acf287f (diff) | |
#84973# check if type is really a bool else look for int
| -rw-r--r-- | connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 04550ffc763f..d209612019ff 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ODatabaseMetaDataResultSet.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fs $ $Date: 2001-03-08 14:18:58 $ + * last change: $Author: oj $ $Date: 2001-03-15 08:17:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,7 +214,18 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex throw DisposedException(); columnIndex = mapColumn(columnIndex); - return getValue(m_aStatementHandle,columnIndex,SQL_C_BIT,m_bWasNull,**this,sal_Int8(0)); + + sal_Bool bRet = sal_False; + sal_Int32 nType = getMetaData()->getColumnType(columnIndex); + switch(nType) + { + case DataType::BIT: + bRet = sal_Int8(getValue(m_aStatementHandle,columnIndex,SQL_C_BIT,m_bWasNull,**this,sal_Int8(0))) != 0; + break; + default: + bRet = getInt(columnIndex) != 0; + } + return bRet; } // ------------------------------------------------------------------------- @@ -228,7 +239,7 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t sal_Int8 nVal = getValue(m_aStatementHandle,columnIndex,SQL_C_CHAR,m_bWasNull,**this,sal_Int8(0)); if(m_aValueRange.size() && (m_aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end()) - return (*m_aValueRangeIter).second[(sal_Int32)nVal]; + return sal_Int8((*m_aValueRangeIter).second[(sal_Int32)nVal]); return nVal; } // ------------------------------------------------------------------------- @@ -404,7 +415,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) sal_Int16 nVal = getValue(m_aStatementHandle,columnIndex,SQL_C_SHORT,m_bWasNull,**this,sal_Int16(0)); if(m_aValueRange.size() && (m_aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end()) - return (*m_aValueRangeIter).second[(sal_Int32)nVal]; + return sal_Int16((*m_aValueRangeIter).second[(sal_Int32)nVal]); return nVal; } // ------------------------------------------------------------------------- |