You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2026/07/27 06:50:32 UTC

(openoffice) 12/20: Fix ADO driver data types that differ between i386 and amd64.

This is an automated email from the ASF dual-hosted git repository.

leginee pushed a commit to branch bazel-migration
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 1ed39da9214c6e1b7a355f8fda81df7d65dd6c97
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Feb 15 18:40:33 2025 +0200

    Fix ADO driver data types that differ between i386 and amd64.
    
    Patch by: me
    
    (cherry picked from commit 3f8f95abcd8c826bf60b52dcebad0438358a3937)
    (cherry picked from commit 5da9be50a1800ade3172fc01d8d908182e2b1776)
---
 main/connectivity/source/drivers/ado/AResultSet.cxx | 2 +-
 main/connectivity/source/drivers/ado/Awrapado.cxx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/connectivity/source/drivers/ado/AResultSet.cxx b/main/connectivity/source/drivers/ado/AResultSet.cxx
index 4dc25e995f..dc16d4e9ed 100644
--- a/main/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSet.cxx
@@ -274,7 +274,7 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-	sal_IntPtr 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/main/connectivity/source/drivers/ado/Awrapado.cxx b/main/connectivity/source/drivers/ado/Awrapado.cxx
index 1a0f66fa07..013168ccbe 100644
--- a/main/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/main/connectivity/source/drivers/ado/Awrapado.cxx
@@ -773,7 +773,7 @@ void WpADORecordset::Close()
  sal_IntPtr WpADORecordset::get_AbsolutePosition()
 {
 	OSL_ENSURE(pInterface,"Interface is null!");
-	sal_IntPtr aTemp=adPosUnknown;
+	PositionEnum_Param aTemp=adPosUnknown;
 	pInterface->get_AbsolutePosition(&aTemp);
 	return aTemp;
 }