[Libreoffice-commits] core.git: connectivity/source

[Jaskaran]

 connectivity/source/drivers/dbase/DIndexIter.cxx |   18 +++++++++---------
 connectivity/source/drivers/dbase/DResultSet.cxx |    2 +-
 connectivity/source/inc/dbase/DIndexIter.hxx     |   14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 45701913f642b17aabd67b52de9002cc79cf07ae
Author: Jaskaran <jvsg1303 at gmail.com>
Date:   Tue Mar 8 21:07:40 2016 +0530

    tdf#75280 Replace sal_uIntPtr to better types in /connectivity
    
    Many other occurences of outdated sal_uIntPtr still remain.This
    commit does not fully fix the issue.
    
    Change-Id: I744a4399a12cefb48e948c20c2d0dec833116b81
    Reviewed-on: https://gerrit.libreoffice.org/23034
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index e77f03e..3c0318b 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -34,20 +34,20 @@ OIndexIterator::~OIndexIterator()
 }
 
 
-sal_uIntPtr OIndexIterator::First()
+sal_uInt32 OIndexIterator::First()
 {
     return Find(true);
 }
 
 
-sal_uIntPtr OIndexIterator::Next()
+sal_uInt32 OIndexIterator::Next()
 {
     return Find(false);
 }
 
-sal_uIntPtr OIndexIterator::Find(bool bFirst)
+sal_uInt32 OIndexIterator::Find(bool bFirst)
 {
-    sal_uIntPtr nRes = NODE_NOTFOUND;
+    sal_uInt32 nRes = NODE_NOTFOUND;
 
     if (bFirst)
     {
@@ -129,7 +129,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 }
 
 
-sal_uIntPtr OIndexIterator::GetCompare(bool bFirst)
+sal_uInt32 OIndexIterator::GetCompare(bool bFirst)
 {
     ONDXKey* pKey = nullptr;
     sal_Int32 ePredicateType = dynamic_cast<file::OOp_COMPARE&>(*m_pOperator).getPredicateType();
@@ -199,7 +199,7 @@ sal_uIntPtr OIndexIterator::GetCompare(bool bFirst)
 }
 
 
-sal_uIntPtr OIndexIterator::GetLike(bool bFirst)
+sal_uInt32 OIndexIterator::GetLike(bool bFirst)
 {
     if (bFirst)
     {
@@ -219,7 +219,7 @@ sal_uIntPtr OIndexIterator::GetLike(bool bFirst)
 }
 
 
-sal_uIntPtr OIndexIterator::GetNull(bool bFirst)
+sal_uInt32 OIndexIterator::GetNull(bool bFirst)
 {
     if (bFirst)
     {
@@ -241,13 +241,13 @@ sal_uIntPtr OIndexIterator::GetNull(bool bFirst)
 }
 
 
-sal_uIntPtr OIndexIterator::GetNotNull(bool bFirst)
+sal_uInt32 OIndexIterator::GetNotNull(bool bFirst)
 {
     ONDXKey* pKey;
     if (bFirst)
     {
         // go through all NULL values first
-        for (sal_uIntPtr nRec = GetNull(bFirst);
+        for (sal_uInt32 nRec = GetNull(bFirst);
              nRec != NODE_NOTFOUND;
              nRec = GetNull(false))
                  ;
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index e83e270..3e31902 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -167,7 +167,7 @@ bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xInde
 
             if (pIter)
             {
-                sal_uIntPtr nRec = pIter->First();
+                sal_uInt32 nRec = pIter->First();
                 while (nRec != NODE_NOTFOUND)
                 {
                     if (m_aOrderbyAscending[0])
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 7d3dd2f..0b70f96 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -41,11 +41,11 @@ namespace connectivity
                                     m_aCurLeaf;
             sal_uInt16              m_nCurNode;
 
-            sal_uIntPtr Find(bool bFirst);
-            sal_uIntPtr GetCompare(bool bFirst);
-            sal_uIntPtr GetLike(bool bFirst);
-            sal_uIntPtr GetNull(bool bFirst);
-            sal_uIntPtr GetNotNull(bool bFirst);
+            sal_uInt32 Find(bool bFirst);
+            sal_uInt32 GetCompare(bool bFirst);
+            sal_uInt32 GetLike(bool bFirst);
+            sal_uInt32 GetNull(bool bFirst);
+            sal_uInt32 GetNotNull(bool bFirst);
 
             ONDXKey* GetFirstKey(ONDXPage* pPage,
                                 const file::OOperand& rKey);
@@ -64,8 +64,8 @@ namespace connectivity
             }
 
             virtual ~OIndexIterator();
-            sal_uIntPtr First();
-            sal_uIntPtr Next();
+            sal_uInt32 First();
+            sal_uInt32 Next();
 
         };
     }