User: hr Date: 06/06/19 18:56:55 Modified: /dba/connectivity/source/drivers/odbc/ OTools.cxx
Log: INTEGRATION: CWS warnings01 (1.26.30); FILE MERGED 2006/01/25 20:59:03 sb 1.26.30.5: RESYNC: (1.26-1.27); FILE MERGED 2005/12/22 11:44:57 fs 1.26.30.4: #i57457# warning-free code 2005/11/21 10:07:56 fs 1.26.30.3: #i57457# warning-free code on unx* 2005/11/16 12:59:21 fs 1.26.30.2: #i57457# warning free code 2005/11/07 14:44:04 fs 1.26.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OTools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OTools.cxx?r1=1.27&r2=1.28 Delta lines: +37 -36 --------------------- --- OTools.cxx 3 Jan 2006 16:04:35 -0000 1.27 +++ OTools.cxx 20 Jun 2006 01:56:53 -0000 1.28 @@ -1,4 +1,4 @@ -/************************************************************************* +/************************************************************************ * * OpenOffice.org - a multi-platform office productivity suite * @@ -33,10 +33,6 @@ * ************************************************************************/ -#include <cstring> -#include <string> -#include <algorithm> - #ifndef _CONNECTIVITY_OTOOLS_HXX_ #include "odbc/OTools.hxx" #endif @@ -53,6 +49,13 @@ #ifndef _CONNECTIVITY_ODBC_OCONNECTION_HXX_ #include "odbc/OConnection.hxx" #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif + +#include <cstring> +#include <string> +#include <algorithm> using namespace connectivity::odbc; using namespace com::sun::star::uno; @@ -101,7 +104,6 @@ SQLINTEGER* pLen = (SQLINTEGER*)pLenBuffer; SQLUINTEGER nColumnSize=0; SQLSMALLINT nDecimalDigits=0; - SQLSMALLINT nNullable=0; OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType); @@ -268,7 +270,6 @@ sal_Int32 columnIndex, SQLSMALLINT _nType, SQLSMALLINT _nMaxLen, - SQLSMALLINT _nScale, const void* _pValue, void* _pData, SQLINTEGER *pLen, @@ -291,7 +292,7 @@ { *pLen = SQL_NULL_DATA; nRetcode = (*(T3SQLBindCol)_pConnection->getOdbcFunction(ODBC3SQLBindCol))(_aStatementHandle, - columnIndex, + (SQLUSMALLINT)columnIndex, fCType, _pData, nMaxLen, @@ -320,7 +321,7 @@ ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding)); *pLen = SQL_NTS; *((::rtl::OString*)_pData) = aString; - _nMaxLen = aString.getLength(); + _nMaxLen = (SQLSMALLINT)aString.getLength(); // Zeiger auf Char* _pData = (void*)aString.getStr(); @@ -342,7 +343,7 @@ // else { ::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue); - _nMaxLen = aString.getLength(); + _nMaxLen = (SQLSMALLINT)aString.getLength(); *pLen = _nMaxLen; *((::rtl::OString*)_pData) = aString; // Zeiger auf Char* @@ -411,7 +412,7 @@ } nRetcode = (*(T3SQLBindCol)_pConnection->getOdbcFunction(ODBC3SQLBindCol))(_aStatementHandle, - columnIndex, + (SQLUSMALLINT)columnIndex, fCType, _pData, nMaxLen, @@ -446,7 +447,6 @@ case SQL_INVALID_HANDLE: OSL_ENSURE(0,"SdbODBC3_SetStatus: SQL_INVALID_HANDLE"); throw SQLException(); - break; } @@ -469,6 +469,7 @@ szSqlState, &pfNativeError, szErrorMessage,sizeof szErrorMessage - 1,&pcbErrorMsg); + OSL_UNUSED( n ); OSL_ENSURE(n != SQL_INVALID_HANDLE,"SdbODBC3_SetStatus: SQLError returned SQL_INVALID_HANDLE"); OSL_ENSURE(n == SQL_SUCCESS || n == SQL_SUCCESS_WITH_INFO || n == SQL_NO_DATA_FOUND || n == SQL_ERROR,"SdbODBC3_SetStatus: SQLError failed"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
