summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-25 00:57:51 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-25 00:58:03 +0200
commite9737f2b0214336176f79485cc4318e2a6ddc232 (patch)
tree7b2689107eb02912d161547471be084bd3a73647
parent687d3b8e68e59946d12e996f1aa7d28cfb2d414d (diff)
Use correct parameter types in ADO API calls
Fixes compilation errors on 64-bit Windows.
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx2
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx6
-rw-r--r--connectivity/source/drivers/ado/Awrapado.cxx14
-rw-r--r--connectivity/source/inc/ado/AResultSet.hxx2
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx2
-rw-r--r--connectivity/source/inc/ado/Awrapado.hxx8
6 files changed, 17 insertions, 17 deletions
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 3d6259a955..366ac23c4a 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -279,7 +279,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException)
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- PositionEnum aPos;
+ PositionEnum_Param aPos;
m_pRecordSet->get_AbsolutePosition(&aPos);
return (aPos > 0) ? aPos : m_nRowPos;
// return the rowcount from driver if the driver doesn't support this return our count
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index fbb00b949b..2708607e8e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -390,7 +390,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException,
{
assignRecordSet( pSet );
- sal_Int32 nValue;
+ ADO_LONGPTR nValue;
if(m_RecordSet.get_RecordCount(nValue))
pArray[j] = nValue;
}
@@ -443,7 +443,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- sal_Int32 nRet;
+ ADO_LONGPTR nRet;
if(m_RecordSet.IsValid() && m_RecordSet.get_RecordCount(nRet))
return nRet;
return -1;
@@ -512,7 +512,7 @@ sal_Int32 OStatement_Base::getQueryTimeOut() const throw(SQLException, RuntimeE
//------------------------------------------------------------------------------
sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException)
{
- sal_Int32 nRet=-1;
+ ADO_LONGPTR nRet=-1;
if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet)))
::dbtools::throwFunctionSequenceException(NULL);
return nRet;
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index bcd696aa9e..aec997eeae 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -485,7 +485,7 @@ WpADOProperties WpADOField::get_Properties()
sal_Int32 WpADOField::GetActualSize() const
{
OSL_ENSURE(pInterface,"Interface is null!");
- sal_Int32 nActualSize=0;
+ ADO_LONGPTR nActualSize=0;
pInterface->get_ActualSize(&nActualSize);
return nActualSize;
}
@@ -509,7 +509,7 @@ sal_Int32 WpADOField::GetStatus() const
sal_Int32 WpADOField::GetDefinedSize() const
{
OSL_ENSURE(pInterface,"Interface is null!");
- sal_Int32 nDefinedSize=0;
+ ADO_LONGPTR nDefinedSize=0;
pInterface->get_DefinedSize(&nDefinedSize);
return nDefinedSize;
}
@@ -776,10 +776,10 @@ void WpADORecordset::Close()
return bSupports == VARIANT_TRUE;
}
-PositionEnum WpADORecordset::get_AbsolutePosition()
+PositionEnum_Param WpADORecordset::get_AbsolutePosition()
{
OSL_ENSURE(pInterface,"Interface is null!");
- PositionEnum aTemp=adPosUnknown;
+ PositionEnum_Param aTemp=adPosUnknown;
pInterface->get_AbsolutePosition(&aTemp);
return aTemp;
}
@@ -898,19 +898,19 @@ WpADOProperties WpADORecordset::get_Properties() const
return SUCCEEDED(pInterface->NextRecordset(&RecordsAffected,ppiRset));
}
- sal_Bool WpADORecordset::get_RecordCount(sal_Int32 &_nRet) const
+ sal_Bool WpADORecordset::get_RecordCount(ADO_LONGPTR &_nRet) const
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->get_RecordCount(&_nRet));
}
- sal_Bool WpADORecordset::get_MaxRecords(sal_Int32 &_nRet) const
+ sal_Bool WpADORecordset::get_MaxRecords(ADO_LONGPTR &_nRet) const
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->get_MaxRecords(&_nRet));
}
- sal_Bool WpADORecordset::put_MaxRecords(sal_Int32 _nRet)
+ sal_Bool WpADORecordset::put_MaxRecords(ADO_LONGPTR _nRet)
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->put_MaxRecords(_nRet));
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index 2136c0b255..b71730a0a0 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -79,7 +79,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
::std::vector<OLEVariant> m_aBookmarks;
OLEVariant m_aValue;
- sal_Int32 m_nRowPos;
+ ADO_LONGPTR m_nRowPos;
sal_Bool m_bWasNull;
sal_Bool m_bEOF;
sal_Bool m_bOnFirstAfterOpen;
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 841bcfddc9..91f873b468 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -86,7 +86,7 @@ namespace connectivity
::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry
// for each row returned by
// DatabaseMetaData.getTypeInfo.
- sal_Int32 m_nMaxRows;
+ ADO_LONGPTR m_nMaxRows;
sal_Int32 m_nFetchSize;
LockTypeEnum m_eLockType;
CursorTypeEnum m_eCursorType;
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 8c69f6e91e..cc8d7ca63c 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -336,7 +336,7 @@ namespace connectivity
sal_Bool Cancel() const;
sal_Int32 get_State( );
sal_Bool Supports( /* [in] */ CursorOptionEnum CursorOptions);
- PositionEnum get_AbsolutePosition();
+ PositionEnum_Param get_AbsolutePosition();
void GetDataSource(IUnknown** pIUnknown) const ;
void PutRefDataSource(IUnknown* pIUnknown);
void GetBookmark(VARIANT& var);
@@ -358,9 +358,9 @@ namespace connectivity
sal_Bool CancelUpdate();
WpADOProperties get_Properties() const;
sal_Bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset);
- sal_Bool get_RecordCount(sal_Int32 &_nRet) const;
- sal_Bool get_MaxRecords(sal_Int32 &_nRet) const;
- sal_Bool put_MaxRecords(sal_Int32 _nRet);
+ sal_Bool get_RecordCount(ADO_LONGPTR &_nRet) const;
+ sal_Bool get_MaxRecords(ADO_LONGPTR &_nRet) const;
+ sal_Bool put_MaxRecords(ADO_LONGPTR _nRet);
sal_Bool get_CursorType(CursorTypeEnum &_nRet) const;
sal_Bool put_CursorType(CursorTypeEnum _nRet);
sal_Bool get_LockType(LockTypeEnum &_nRet) const;