User: rt Date: 2008-01-29 13:54:48+0000 Modified: dba/connectivity/source/drivers/odbc/OResultSet.cxx
Log: INTEGRATION: CWS reportdesign02 (1.64.150); FILE MERGED 2007/10/26 12:02:53 oj 1.64.150.1: #i61881# use odbc type instead of jdbc type File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OResultSet.cxx?r1=1.64&r2=1.65 Delta lines: +13 -5 -------------------- --- OResultSet.cxx 2006-09-17 03:07:12+0000 1.64 +++ OResultSet.cxx 2008-01-29 13:54:46+0000 1.65 @@ -517,15 +517,21 @@ return nRet; } - sal_Int32 nType = getMetaData()->getColumnType(columnIndex); + SWORD nType = OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex); switch(nType) { - case DataType::VARCHAR: - case DataType::LONGVARCHAR: + case SQL_WVARCHAR: + case SQL_WCHAR: + case SQL_WLONGVARCHAR: + case SQL_VARCHAR: + case SQL_CHAR: + case SQL_LONGVARCHAR: { - ::rtl::OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,(SWORD)nType,m_bWasNull,**this,m_nTextEncoding); + ::rtl::OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nType,m_bWasNull,**this,m_nTextEncoding); return Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(aRet.getStr()),sizeof(sal_Unicode)*aRet.getLength()); } + default: + ; } return OTools::getBytesValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_BINARY,m_bWasNull,**this); } @@ -664,7 +670,9 @@ if(m_bFetchData) nRet = getValue(columnIndex,0,NULL,0); else - nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,(SWORD)getMetaData()->getColumnType(columnIndex),m_bWasNull,**this,m_nTextEncoding); + { + nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex),m_bWasNull,**this,m_nTextEncoding); + } return nRet; } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
