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/sbxbool.cxx | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index c3ed0d09b134..7b9ffe8a1136 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -94,15 +94,15 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
                 else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
                 {
                     // Jetzt kann es noch in eine Zahl konvertierbar sein
-                    BOOL bError = TRUE;
+                    sal_Bool bError = sal_True;
                     double n;
                     SbxDataType t;
-                    USHORT nLen = 0;
+                    sal_uInt16 nLen = 0;
                     if( ImpScan( *p->pOUString, n, t, &nLen ) == SbxERR_OK )
                     {
                         if( nLen == p->pOUString->getLength() )
                         {
-                            bError = FALSE;
+                            bError = sal_False;
                             if( n != 0.0 )
                                 nRes = SbxTRUE;
                         }
@@ -159,7 +159,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
     return nRes;
 }
 
-void ImpPutBool( SbxValues* p, INT16 n )
+void ImpPutBool( SbxValues* p, sal_Int16 n )
 {
     if( n )
         n = SbxTRUE;
@@ -168,17 +168,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxCHAR:
             p->nChar = (xub_Unicode) n; break;
         case SbxUINT:
-            p->nByte = (BYTE) n; break;
+            p->nByte = (sal_uInt8) n; break;
         case SbxINTEGER:
         case SbxBOOL:
             p->nInteger = n; break;
         case SbxLONG:
             p->nLong = n; break;
         case SbxULONG:
-            p->nULong = (UINT32) n; break;
+            p->nULong = (sal_uInt32) n; break;
         case SbxERROR:
         case SbxUSHORT:
-            p->nUShort = (UINT16) n; break;
+            p->nUShort = (sal_uInt16) n; break;
         case SbxSINGLE:
             p->nSingle = n; break;
         case SbxDATE:
@@ -189,13 +189,13 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxSALUINT64:
             p->uInt64 = n; break;
         case SbxULONG64:
-            p->nULong64.Set( (UINT32)n ); break;
+            p->nULong64.Set( (sal_uInt32)n ); break;
         case SbxLONG64:
         case SbxCURRENCY:
-            p->nLong64.Set( (INT32)n ); break;
+            p->nLong64.Set( (sal_Int32)n ); break;
         case SbxDECIMAL:
         case SbxBYREF | SbxDECIMAL:
-            ImpCreateDecimal( p )->setInt( (INT16)n );
+            ImpCreateDecimal( p )->setInt( (sal_Int16)n );
             break;
 
         case SbxBYREF | SbxSTRING:
@@ -211,7 +211,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
         {
             SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
             if( pVal )
-                pVal->PutBool( BOOL( n != 0 ) );
+                pVal->PutBool( sal_Bool( n != 0 ) );
             else
                 SbxBase::SetError( SbxERR_NO_OBJECT );
             break;
@@ -219,17 +219,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxBYREF | SbxCHAR:
             *p->pChar = (xub_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             *p->pLong = n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = n; break;
         case SbxBYREF | SbxDATE:
@@ -240,10 +240,10 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxBYREF | SbxSALUINT64:
             *p->puInt64 = n; break;
         case SbxBYREF | SbxULONG64:
-            p->pULong64->Set( (UINT32)n ); break;
+            p->pULong64->Set( (sal_uInt32)n ); break;
         case SbxBYREF | SbxLONG64:
         case SbxBYREF | SbxCURRENCY:
-            p->pLong64->Set( (INT32)n ); break;
+            p->pLong64->Set( (sal_Int32)n ); break;
 
         default:
             SbxBase::SetError( SbxERR_CONVERSION );
-- 
cgit