[Libreoffice-commits] .: basic/source

[August Sodora]

 basic/source/comp/scanner.cxx |   18 +++++++++---------
 basic/source/inc/scanner.hxx  |   26 +++++++++++++-------------
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 971bf1aa4c043ef49e4857204ea49de48707a86a
Author: August Sodora <augsod at gmail.com>
Date:   Mon Dec 5 17:41:28 2011 -0500

    Use sal_Int32 in all these places

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 4b4ba23..e1a5c75 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -91,7 +91,7 @@ void SbiScanner::GenError( SbError code )
         {
             // in case of EXPECTED or UNEXPECTED it always refers
             // to the last token, so take the Col1 over
-            sal_uInt16 nc = nColLock ? nSavedCol1 : nCol1;
+            sal_Int32 nc = nColLock ? nSavedCol1 : nCol1;
             switch( code )
             {
                 case SbERR_EXPECTED:
@@ -152,7 +152,7 @@ static SbxDataType GetSuffixType( sal_Unicode c )
 
 void SbiScanner::scanAlphanumeric()
 {
-    sal_uInt16 n = nCol;
+    sal_Int32 n = nCol;
     while(theBasicCharClass::get().isAlphaNumeric(*pLine, bCompatible) || *pLine == '_')
     {
         pLine++;
@@ -163,7 +163,7 @@ void SbiScanner::scanAlphanumeric()
 
 void SbiScanner::scanGoto()
 {
-    sal_uInt16 nTestCol = nCol;
+    sal_Int32 nTestCol = nCol;
     while(nTestCol < aLine.getLength() && theBasicCharClass::get().isWhitespace(aLine[nTestCol]))
         nTestCol++;
 
@@ -182,9 +182,9 @@ void SbiScanner::scanGoto()
 bool SbiScanner::NextSym()
 {
     // memorize for the EOLN-case
-    sal_uInt16 nOldLine = nLine;
-    sal_uInt16 nOldCol1 = nCol1;
-    sal_uInt16 nOldCol2 = nCol2;
+    sal_Int32 nOldLine = nLine;
+    sal_Int32 nOldCol1 = nCol1;
+    sal_Int32 nOldCol2 = nCol2;
     sal_Unicode buf[ BUF_SIZE ], *p = buf;
     bHash = false;
 
@@ -433,7 +433,7 @@ bool SbiScanner::NextSym()
         sal_Unicode cSep = *pLine;
         if( cSep == '[' )
             bSymbol = true, cSep = ']';
-        sal_uInt16 n = nCol + 1;
+        sal_Int32 n = nCol + 1;
         while( *pLine )
         {
             do pLine++, nCol++;
@@ -469,7 +469,7 @@ bool SbiScanner::NextSym()
     // other groups:
     else
     {
-        sal_uInt8 n = 1;
+        sal_Int32 n = 1;
         switch( *pLine++ )
         {
             case '<': if( *pLine == '>' || *pLine == '=' ) n = 2; break;
@@ -489,7 +489,7 @@ PrevLineCommentLbl:
     {
         bPrevLineExtentsComment = false;
         aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REM"));
-        sal_uInt16 nLen = String( pLine ).Len();
+        sal_Int32 nLen = String( pLine ).Len();
         if( bCompatible && pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' ' )
             bPrevLineExtentsComment = true;
         nCol2 = nCol2 + nLen;
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index abda26b..1bb554b 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -54,14 +54,14 @@ protected:
     SbxDataType eScanType;
     StarBASIC* pBasic;                  // instance for error callbacks
     double nVal;                        // numeric value
-    short  nCurCol1;
-    short  nSavedCol1;
-    short  nCol;
-    short  nErrors;
-    short  nColLock;                    // lock counter for Col1
-    sal_Int32  nBufPos;
-    sal_uInt16 nLine;
-    sal_uInt16 nCol1, nCol2;
+    sal_Int32 nCurCol1;
+    sal_Int32 nSavedCol1;
+    sal_Int32 nCol;
+    sal_Int32 nErrors;
+    sal_Int32 nColLock;                    // lock counter for Col1
+    sal_Int32 nBufPos;
+    sal_Int32 nLine;
+    sal_Int32 nCol1, nCol2;
     bool   bSymbol;                     // sal_True: symbol scanned
     bool   bNumber;                     // sal_True: number scanned
     bool   bSpaces;                     // sal_True: whitespace before token
@@ -86,11 +86,11 @@ public:
     bool  IsVBASupportOn()          { return bVBASupportOn; }
     void  SetVBASupportOn( bool b ) { bVBASupportOn = b; }
     bool  WhiteSpace()              { return bSpaces; }
-    short GetErrors()               { return nErrors; }
-    short GetLine()                 { return nLine;   }
-    short GetCol1()                 { return nCol1;   }
-    short GetCol2()                 { return nCol2;   }
-    void  SetCol1( short n )        { nCol1 = n;      }
+    sal_Int32 GetErrors()           { return nErrors; }
+    sal_Int32 GetLine()             { return nLine;   }
+    sal_Int32 GetCol1()             { return nCol1;   }
+    sal_Int32 GetCol2()             { return nCol2;   }
+    void  SetCol1( sal_Int32 n )    { nCol1 = n;      }
     StarBASIC* GetBasic()           { return pBasic;  }
     void  SaveLine(void)            { pSaveLine = pLine; }
     void  RestoreLine(void)         { pLine = pSaveLine; }