basic: remove use of sal_uIntptr in favor of more appropriate type

Change-Id: Ie878f43c7245838519fe7477b039827b079dde63
Reviewed-on: https://gerrit.libreoffice.org/8214
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

2 files changed, 21 insertions, 21 deletions

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 04ee05998844..c7552ccc2607 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -913,7 +913,7 @@ RTLFUNC(InStr)
     (void)pBasic;
     (void)bWrite;
 
-    sal_uIntPtr nArgCount = rPar.Count()-1;
+    sal_Size nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -986,7 +986,7 @@ RTLFUNC(InStrRev)
     (void)pBasic;
     (void)bWrite;
 
-    sal_uIntPtr nArgCount = rPar.Count()-1;
+    sal_Size nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1343,7 +1343,7 @@ RTLFUNC(Replace)
     (void)pBasic;
     (void)bWrite;
 
-    sal_uIntPtr nArgCount = rPar.Count()-1;
+    sal_Size nArgCount = rPar.Count()-1;
     if ( nArgCount < 3 || nArgCount > 6 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3392,7 +3392,7 @@ RTLFUNC(Loc)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        sal_uIntPtr nPos;
+        sal_Size nPos;
         if( pSbStrm->IsRandom())
         {
             short nBlockLen = pSbStrm->GetBlockLen();
@@ -3440,8 +3440,8 @@ RTLFUNC(Lof)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        sal_uIntPtr nOldPos = pSvStrm->Tell();
-        sal_uIntPtr nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+        sal_Size nOldPos = pSvStrm->Tell();
+        sal_Size nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
         pSvStrm->Seek( nOldPos );
         rPar.Get(0)->PutLong( (sal_Int32)nLen );
     }
@@ -3472,7 +3472,7 @@ RTLFUNC(Seek)
 
     if ( nArgs == 2 )   // Seek-Function
     {
-        sal_uIntPtr nPos = pStrm->Tell();
+        sal_Size nPos = pStrm->Tell();
         if( pSbStrm->IsRandom() )
         {
             nPos = nPos / pSbStrm->GetBlockLen();
@@ -3494,7 +3494,7 @@ RTLFUNC(Seek)
         {
             nPos *= pSbStrm->GetBlockLen();
         }
-        pStrm->Seek( (sal_uIntPtr)nPos );
+        pStrm->Seek( (sal_Size)nPos );
         pSbStrm->SetExpandOnWriteTo( nPos );
     }
 }
@@ -3585,7 +3585,7 @@ RTLFUNC(Shell)
         return;
     }
 
-    sal_uIntPtr nArgCount = rPar.Count();
+    sal_Size nArgCount = rPar.Count();
     if ( nArgCount < 2 || nArgCount > 5 )
     {
         rPar.Get(0)->PutLong(0);
@@ -4204,10 +4204,10 @@ RTLFUNC(RGB)
         return;
     }
 
-    sal_uIntPtr nRed     = rPar.Get(1)->GetInteger() & 0xFF;
-    sal_uIntPtr nGreen = rPar.Get(2)->GetInteger() & 0xFF;
-    sal_uIntPtr nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
-    sal_uIntPtr nRGB;
+    sal_Int32 nRed     = rPar.Get(1)->GetInteger() & 0xFF;
+    sal_Int32 nGreen = rPar.Get(2)->GetInteger() & 0xFF;
+    sal_Int32 nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
+    sal_Int32 nRGB;
 
     SbiInstance* pInst = GetSbData()->pInst;
     bool bCompatibility = ( pInst && pInst->IsCompatibility() );
@@ -4269,7 +4269,7 @@ RTLFUNC(StrConv)
     (void)pBasic;
     (void)bWrite;
 
-    sal_uIntPtr nArgCount = rPar.Count()-1;
+    sal_Size nArgCount = rPar.Count()-1;
     if( nArgCount < 2 || nArgCount > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 9749ece67d6f..6b52e281600e 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -541,7 +541,7 @@ RTLFUNC(Red)
     }
     else
     {
-        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
+        sal_Int32 nRGB = rPar.Get(1)->GetLong();
         nRGB &= 0x00FF0000;
         nRGB >>= 16;
         rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
@@ -559,7 +559,7 @@ RTLFUNC(Green)
     }
     else
     {
-        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
+        sal_Int32 nRGB = rPar.Get(1)->GetLong();
         nRGB &= 0x0000FF00;
         nRGB >>= 8;
         rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
@@ -577,7 +577,7 @@ RTLFUNC(Blue)
     }
     else
     {
-        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
+        sal_Int32 nRGB = rPar.Get(1)->GetLong();
         nRGB &= 0x000000FF;
         rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
@@ -982,7 +982,7 @@ RTLFUNC(FindPropertyObject)
 static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
                                       sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
-    sal_uIntPtr nFPos = pStrm->Tell();
+    sal_Size nFPos = pStrm->Tell();
 
     sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eType = rVar.GetType();
@@ -1089,7 +1089,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
 
     double aDouble;
 
-    sal_uIntPtr nFPos = pStrm->Tell();
+    sal_Size nFPos = pStrm->Tell();
 
     sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eVarType = rVar.GetType();
@@ -1259,7 +1259,7 @@ void PutGet( SbxArray& rPar, sal_Bool bPut )
 
     if( bHasRecordNo )
     {
-        sal_uIntPtr nFilePos = bRandom ? (sal_uIntPtr)(nBlockLen*nRecordNo) : (sal_uIntPtr)nRecordNo;
+        sal_Size nFilePos = bRandom ? (sal_Size)(nBlockLen * nRecordNo) : (sal_Size)nRecordNo;
         pStrm->Seek( nFilePos );
     }
 
@@ -1275,7 +1275,7 @@ void PutGet( SbxArray& rPar, sal_Bool bPut )
 
     if( pArr )
     {
-        sal_uIntPtr nFPos = pStrm->Tell();
+        sal_Size nFPos = pStrm->Tell();
         short nDims = pArr->GetDims();
         short* pDims = new short[ nDims ];
         bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);