1 files changed, 15 insertions, 15 deletions

diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index cbdc32c30d4f..90d8ecc40a20 100644..100755
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -32,10 +32,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-BYTE ImpGetByte( const SbxValues* p )
+sal_uInt8 ImpGetByte( const SbxValues* p )
 {
     SbxValues aTmp;
-    BYTE nRes;
+    sal_uInt8 nRes;
 start:
     switch( +p->eType )
     {
@@ -49,10 +49,10 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nChar;
+                nRes = (sal_uInt8) p->nChar;
             break;
         case SbxBYTE:
-            nRes = (BYTE) p->nByte; break;
+            nRes = (sal_uInt8) p->nByte;    break;
         case SbxINTEGER:
         case SbxBOOL:
             if( p->nInteger > SbxMAXBYTE )
@@ -64,16 +64,16 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nInteger;
+                nRes = (sal_uInt8) p->nInteger;
             break;
         case SbxERROR:
         case SbxUSHORT:
-            if( p->nUShort > (USHORT) SbxMAXBYTE )
+            if( p->nUShort > (sal_uInt16) SbxMAXBYTE )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nUShort;
+                nRes = (sal_uInt8) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXBYTE )
@@ -85,7 +85,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nLong;
+                nRes = (sal_uInt8) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXBYTE )
@@ -93,7 +93,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nULong;
+                nRes = (sal_uInt8) p->nULong;
             break;
         case SbxCURRENCY:
         case SbxSALINT64:
@@ -110,7 +110,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) val;
+                nRes = (sal_uInt8) val;
             break;
         }
         case SbxSALUINT64:
@@ -119,7 +119,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->uInt64;
+                nRes = (sal_uInt8) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXBYTE )
@@ -131,7 +131,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( p->nSingle );
+                nRes = (sal_uInt8) ImpRound( p->nSingle );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -157,7 +157,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -180,7 +180,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (BYTE) ( d + 0.5 );
+                    nRes = (sal_uInt8) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -231,7 +231,7 @@ start:
     return nRes;
 }
 
-void ImpPutByte( SbxValues* p, BYTE n )
+void ImpPutByte( SbxValues* p, sal_uInt8 n )
 {
     switch( +p->eType )
     {