removetooltypes01: #i112600# Remove tools types from basic

5 files changed, 30 insertions, 30 deletions

diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index bd4ce91f451b..578f0cfb8adf 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -150,7 +150,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -289,17 +289,17 @@ start:
         case SbxBYREF | SbxCHAR:
             *p->pChar = n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             *p->pInteger = n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = (float) n; break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index e27b11d5166c..5b6e631d174f 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -257,7 +257,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pByte = (BYTE) dVal; break;
+            *p->pByte = (sal_uInt8) dVal; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( dVal > SbxMAXINT )
@@ -268,7 +268,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = SbxMININT;
             }
-            *p->pInteger = (INT16) dVal; break;
+            *p->pInteger = (sal_Int16) dVal; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( dVal > SbxMAXUINT )
@@ -279,7 +279,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pUShort = (UINT16) dVal; break;
+            *p->pUShort = (sal_uInt16) dVal; break;
         case SbxBYREF | SbxLONG:
             if( dVal > SbxMAXLNG )
             {
@@ -289,7 +289,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = SbxMINLNG;
             }
-            *p->pLong = (INT32) dVal; break;
+            *p->pLong = (sal_Int32) dVal; break;
         case SbxBYREF | SbxULONG:
             if( dVal > SbxMAXULNG )
             {
@@ -299,7 +299,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = 0;
             }
-            *p->pULong = (UINT32) dVal; break;
+            *p->pULong = (sal_uInt32) dVal; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = ImpDoubleToSalInt64( dVal ); break;
         case SbxBYREF | SbxSALUINT64:
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 70ef1653666b..50313cfe1780 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -270,7 +270,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -281,7 +281,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -292,10 +292,10 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
         {
-            INT32 i;
+            sal_Int32 i;
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXLNG;
@@ -306,13 +306,13 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< INT32 >(n);
+                i = sal::static_int_cast< sal_Int32 >(n);
             }
             *p->pLong = i; break;
         }
         case SbxBYREF | SbxULONG:
         {
-            UINT32 i;
+            sal_uInt32 i;
             if( n > SbxMAXULNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXULNG;
@@ -323,7 +323,7 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< UINT32 >(n);
+                i = sal::static_int_cast< sal_uInt32 >(n);
             }
             *p->pULong = i; break;
         }
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 5b75a24d6d26..6bfc0c39d260 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -31,10 +31,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-UINT16 ImpGetUShort( const SbxValues* p )
+sal_uInt16 ImpGetUShort( const SbxValues* p )
 {
     SbxValues aTmp;
-    UINT16 nRes;
+    sal_uInt16 nRes;
 start:
     switch( +p->eType )
     {
@@ -70,7 +70,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nLong;
+                nRes = (sal_uInt16) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXUINT )
@@ -78,7 +78,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->nULong;
+                nRes = (sal_uInt16) p->nULong;
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXUINT )
@@ -90,7 +90,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nInt64;
+                nRes = (sal_uInt16) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXUINT )
@@ -98,7 +98,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->uInt64;
+                nRes = (sal_uInt16) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXUINT )
@@ -110,7 +110,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( p->nSingle + 0.5 );
+                nRes = (sal_uInt16) ( p->nSingle + 0.5 );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -145,7 +145,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( dVal + 0.5 );
+                nRes = (sal_uInt16) ( dVal + 0.5 );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -168,7 +168,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (UINT16) ( d + 0.5 );
+                    nRes = (sal_uInt16) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -223,7 +223,7 @@ start:
     return nRes;
 }
 
-void ImpPutUShort( SbxValues* p, UINT16 n )
+void ImpPutUShort( SbxValues* p, sal_uInt16 n )
 {
     SbxValues aTmp;
 
@@ -293,14 +293,14 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             *p->pUShort = n; break;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index fdc90acb8d5b..1f33cc8acfd2 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -647,7 +647,7 @@ void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     ByteString aBNameStr( (const UniString&)GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US );
     rStrm << "Variable( "
-          << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=="
+          << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=="
           << aBNameStr.GetBuffer();
     ByteString aBParentNameStr( (const UniString&)GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US );
     if ( GetParent() )