summaryrefslogtreecommitdiff
path: root/basic/source/sbx/sbxlng.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/sbx/sbxlng.cxx')
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxlng.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 32e994520c13..dd772fe4a52a 100644..100755
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -32,10 +32,10 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-INT32 ImpGetLong( const SbxValues* p )
+sal_Int32 ImpGetLong( const SbxValues* p )
{
SbxValues aTmp;
- INT32 nRes;
+ sal_Int32 nRes;
start:
switch( +p->eType )
{
@@ -61,7 +61,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXLNG;
}
else
- nRes = (INT32) p->nULong;
+ nRes = (sal_Int32) p->nULong;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXLNG )
@@ -73,7 +73,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( p->nSingle );
+ nRes = (sal_Int32) ImpRound( p->nSingle );
break;
case SbxSALINT64:
nRes = p->nInt64;
@@ -84,7 +84,7 @@ start:
case SbxCURRENCY:
{
sal_Int64 tstVal = p->nInt64 / CURRENCY_FACTOR;
- nRes = (INT32) (tstVal);
+ nRes = (sal_Int32) (tstVal);
if( tstVal < SbxMINLNG || SbxMAXLNG < tstVal ) SbxBase::SetError( SbxERR_OVERFLOW );
if( SbxMAXLNG < tstVal ) nRes = SbxMAXLNG;
if( tstVal < SbxMINLNG ) nRes = SbxMINLNG;
@@ -114,7 +114,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( dVal );
+ nRes = (sal_Int32) ImpRound( dVal );
break;
}
case SbxBYREF | SbxSTRING:
@@ -137,7 +137,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( d );
+ nRes = (sal_Int32) ImpRound( d );
}
break;
case SbxOBJECT:
@@ -189,7 +189,7 @@ start:
return nRes;
}
-void ImpPutLong( SbxValues* p, INT32 n )
+void ImpPutLong( SbxValues* p, sal_Int32 n )
{
SbxValues aTmp;
@@ -267,7 +267,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 )
@@ -278,7 +278,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 )
@@ -289,7 +289,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
*p->pLong = n; break;
case SbxBYREF | SbxULONG:
@@ -297,7 +297,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSALINT64:
*p->pnInt64 = n; break;
case SbxBYREF | SbxSALUINT64: