Author: damjan
Date: Fri Nov 17 04:05:27 2017
New Revision: 1815545
URL: http://svn.apache.org/viewvc?rev=1815545&view=rev
Log:
More ODBC64 fixes, for SQLGetStmtAttr() and SQLSetStmtAttr().
Patch by: me
Modified:
openoffice/trunk/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
openoffice/trunk/main/connectivity/source/drivers/odbcbase/OStatement.cxx
openoffice/trunk/main/connectivity/source/inc/odbc/OResultSet.hxx
Modified:
openoffice/trunk/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/odbcbase/OResultSet.cxx?rev=1815545&r1=1815544&r2=1815545&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
Fri Nov 17 04:05:27 2017
@@ -118,7 +118,7 @@ OResultSet::OResultSet(SQLHANDLE _pState
catch(Exception&)
{ // we don't want our result destroy here
}
- SQLINTEGER nCurType = 0;
+ SQLULEN nCurType = 0;
try
{
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nCurType,SQL_IS_UINTEGER,0);
@@ -1263,7 +1263,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSe
//------------------------------------------------------------------------------
sal_Int32 OResultSet::getResultSetConcurrency() const
{
- sal_uInt32 nValue = 0;
+ SQLULEN nValue = 0;
SQLRETURN nReturn =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nReturn );
if(SQL_CONCUR_READ_ONLY == nValue)
@@ -1276,7 +1276,7 @@ sal_Int32 OResultSet::getResultSetConcur
//------------------------------------------------------------------------------
sal_Int32 OResultSet::getResultSetType() const
{
- sal_uInt32 nValue = 0;
+ SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,&nValue,SQL_IS_UINTEGER,0);
if(SQL_SENSITIVE == nValue)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1284,7 +1284,7 @@ sal_Int32 OResultSet::getResultSetType()
nValue = ResultSetType::SCROLL_INSENSITIVE;
else
{
- SQLINTEGER nCurType = 0;
+ SQLULEN nCurType = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nCurType,SQL_IS_UINTEGER,0);
if(SQL_CURSOR_KEYSET_DRIVEN == nCurType)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1305,7 +1305,7 @@ sal_Int32 OResultSet::getFetchDirection(
//------------------------------------------------------------------------------
sal_Int32 OResultSet::getFetchSize() const
{
- sal_uInt32 nValue = 0;
+ SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,&nValue,SQL_IS_UINTEGER,0);
return nValue;
}
@@ -1323,7 +1323,7 @@ sal_Bool OResultSet::isBookmarkable() c
if(!m_aConnectionHandle)
return sal_False;
- sal_uInt32 nValue = 0;
+ SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nValue,SQL_IS_UINTEGER,0);
sal_Int32 nAttr = 0;
@@ -1674,10 +1674,10 @@ sal_Bool OResultSet::move(IResultSetHelp
//
-----------------------------------------------------------------------------
sal_Int32 OResultSet::getDriverPos() const
{
- sal_Int32 nValue = 0;
+ SQLULEN nValue = 0;
SQLRETURN nRet =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_NUMBER,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRet );
- OSL_TRACE( __FILE__": OResultSet::getDriverPos() = Ret = %d, RowNum =
%d, RowPos = %d",nRet,nValue , m_nRowPos);
+ OSL_TRACE( __FILE__": OResultSet::getDriverPos() = Ret = %d, RowNum =
%lu, RowPos = %d",nRet,nValue , m_nRowPos);
return nValue ? nValue : m_nRowPos;
}
//
-----------------------------------------------------------------------------
Modified:
openoffice/trunk/main/connectivity/source/drivers/odbcbase/OStatement.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/odbcbase/OStatement.cxx?rev=1815545&r1=1815544&r2=1815545&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/odbcbase/OStatement.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/odbcbase/OStatement.cxx
Fri Nov 17 04:05:27 2017
@@ -297,7 +297,7 @@ sal_Bool OStatement_Base::lockIfNecessar
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
try
{
- SQLINTEGER nLock = SQL_CONCUR_LOCK;
+ SQLUINTEGER nLock = SQL_CONCUR_LOCK;
THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle,
SQL_CONCURRENCY,(SQLPOINTER)nLock,SQL_IS_UINTEGER));
}
catch (SQLWarning& warn)
@@ -679,7 +679,7 @@ sal_Int32 OStatement_Base::getMaxRows()
sal_Int32 OStatement_Base::getResultSetConcurrency() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue;
+ SQLULEN nValue;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRetCode );
if(nValue == SQL_CONCUR_READ_ONLY)
@@ -692,7 +692,7 @@ sal_Int32 OStatement_Base::getResultSetC
sal_Int32 OStatement_Base::getResultSetType() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue = SQL_CURSOR_FORWARD_ONLY;
+ SQLULEN nValue = SQL_CURSOR_FORWARD_ONLY;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,&nValue,SQL_IS_UINTEGER,0);
nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nValue,SQL_IS_UINTEGER,0);
switch(nValue)
@@ -715,7 +715,7 @@ sal_Int32 OStatement_Base::getResultSetT
sal_Int32 OStatement_Base::getFetchDirection() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue = 0;
+ SQLULEN nValue = 0;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SCROLLABLE,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRetCode );
@@ -735,7 +735,7 @@ sal_Int32 OStatement_Base::getFetchDirec
sal_Int32 OStatement_Base::getFetchSize() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue;
+ SQLULEN nValue;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRetCode );
return nValue;
@@ -772,7 +772,7 @@ void OStatement_Base::setMaxRows(sal_Int
//------------------------------------------------------------------------------
void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0)
{
- SQLINTEGER nSet;
+ SQLUINTEGER nSet;
if(_par0 == ResultSetConcurrency::READ_ONLY)
nSet = SQL_CONCUR_READ_ONLY;
else
@@ -853,7 +853,7 @@ void OStatement_Base::setEscapeProcessin
void OStatement_Base::setFetchDirection(sal_Int32 _par0)
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_Int32 nCursType = 0;
+ SQLUINTEGER nCursType = 0;
SQLRETURN nRetCode = SQL_SUCCESS;
if(_par0 == FetchDirection::FORWARD)
{
@@ -899,7 +899,7 @@ void OStatement_Base::setCursorName(cons
sal_Bool OStatement_Base::isUsingBookmarks() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue = SQL_UB_OFF;
+ SQLULEN nValue = SQL_UB_OFF;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&nValue,SQL_IS_UINTEGER,NULL);
OSL_UNUSED( nRetCode );
return nValue != SQL_UB_OFF;
@@ -908,7 +908,7 @@ sal_Bool OStatement_Base::isUsingBookmar
sal_Bool OStatement_Base::getEscapeProcessing() const
{
OSL_ENSURE( m_aStatementHandle, "StatementHandle is null!" );
- sal_uInt32 nValue = SQL_NOSCAN_OFF;
+ SQLULEN nValue = SQL_NOSCAN_OFF;
SQLRETURN nRetCode = N3SQLGetStmtAttr( m_aStatementHandle,
SQL_ATTR_NOSCAN, &nValue, SQL_IS_UINTEGER, NULL );
(void)nRetCode;
return nValue == SQL_NOSCAN_OFF;
@@ -917,7 +917,7 @@ sal_Bool OStatement_Base::getEscapeProce
void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark)
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- sal_uInt32 nValue = _bUseBookmark ? SQL_UB_VARIABLE : SQL_UB_OFF;
+ SQLUINTEGER nValue = _bUseBookmark ? SQL_UB_VARIABLE : SQL_UB_OFF;
SQLRETURN nRetCode =
N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,(SQLPOINTER)nValue,SQL_IS_UINTEGER);
OSL_UNUSED( nRetCode );
}
Modified: openoffice/trunk/main/connectivity/source/inc/odbc/OResultSet.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/inc/odbc/OResultSet.hxx?rev=1815545&r1=1815544&r2=1815545&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/inc/odbc/OResultSet.hxx (original)
+++ openoffice/trunk/main/connectivity/source/inc/odbc/OResultSet.hxx Fri Nov
17 04:05:27 2017
@@ -137,7 +137,7 @@ namespace connectivity
rtl_TextEncoding
m_nTextEncoding;
sal_Int32
m_nRowPos;
sal_Int32
m_nLastColumnPos; // used for m_aRow just
to know where we are
- mutable sal_uInt32 m_nUseBookmarks;
+ mutable SQLULEN m_nUseBookmarks;
SQLRETURN
m_nCurrentFetchState;
sal_Bool
m_bWasNull;
sal_Bool
m_bEOF; // after last
record
