From 642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 14:40:57 +0100
Subject: removetooltypes01: #i112600# adjust basic and scaddins

---
 basic/source/sbx/sbxexec.cxx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'basic/source/sbx/sbxexec.cxx')

diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index c602b130fc5e..9b43a94873f0 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -37,21 +37,21 @@
 class SbxSimpleCharClass
 {
 public:
-    BOOL isAlpha( sal_Unicode c ) const
+    sal_Bool isAlpha( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+        sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
         return bRet;
     }
 
-    BOOL isDigit( sal_Unicode c ) const
+    sal_Bool isDigit( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= '0' && c <= '9');
+        sal_Bool bRet = (c >= '0' && c <= '9');
         return bRet;
     }
 
-    BOOL isAlphaNumeric( sal_Unicode c ) const
+    sal_Bool isAlphaNumeric( sal_Unicode c ) const
     {
-        BOOL bRet = isDigit( c ) || isAlpha( c );
+        sal_Bool bRet = isDigit( c ) || isAlpha( c );
         return bRet;
     }
 };
@@ -73,7 +73,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
 
 static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
 {
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     // Haben wir ein Sondersymbol?
     if( *p == '[' )
     {
@@ -143,7 +143,7 @@ static SbxVariable* QualifiedName
 // eine Funktion (mit optionalen Parametern) sein.
 
 static SbxVariable* Operand
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, BOOL bVar )
+    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, sal_Bool bVar )
 {
     static SbxSimpleCharClass aCharClass;
 
@@ -155,7 +155,7 @@ static SbxVariable* Operand
      || *p == '&' ) )
     {
         // Eine Zahl kann direkt eingescant werden!
-        USHORT nLen;
+        sal_uInt16 nLen;
         if( !refVar->Scan( XubString( p ), &nLen ) )
             refVar.Clear();
         else
@@ -193,12 +193,12 @@ static SbxVariable* Operand
 static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, FALSE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_False ) );
     p = SkipWhitespace( p );
     while( refVar.Is() && ( *p == '*' || *p == '/' ) )
     {
         xub_Unicode cOp = *p++;
-        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, FALSE ) );
+        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, sal_False ) );
         if( refVar2.Is() )
         {
             // temporaere Variable!
@@ -257,7 +257,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico
 static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, TRUE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_True ) );
     p = SkipWhitespace( p );
     if( refVar.Is() )
     {
@@ -305,7 +305,7 @@ static SbxVariable* Element
     SbxVariableRef refVar;
     if( aSym.Len() )
     {
-        USHORT nOld = pObj->GetFlags();
+        sal_uInt16 nOld = pObj->GetFlags();
         if( pObj == pGbl )
             pObj->SetFlag( SBX_GBLSEARCH );
         refVar = pObj->Find( aSym, t );
@@ -319,7 +319,7 @@ static SbxVariable* Element
             {
                 p++;
                 SbxArrayRef refPar = new SbxArray;
-                USHORT nArg = 0;
+                sal_uInt16 nArg = 0;
                 // Wird sind mal relaxed und akzeptieren auch
                 // das Zeilen- oder Komandoende als Begrenzer
                 // Parameter immer global suchen!
-- 
cgit