summaryrefslogtreecommitdiff
path: root/basic/source/sbx/sbxint.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/sbx/sbxint.cxx')
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxint.cxx54
1 files changed, 27 insertions, 27 deletions
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 285295c05f45..289622a016fd 100644..100755
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -37,10 +37,10 @@ double ImpRound( double d )
return d + ( d < 0 ? -0.5 : 0.5 );
}
-INT16 ImpGetInteger( const SbxValues* p )
+sal_Int16 ImpGetInteger( const SbxValues* p )
{
SbxValues aTmp;
- INT16 nRes;
+ sal_Int16 nRes;
start:
switch( +p->eType )
{
@@ -57,12 +57,12 @@ start:
nRes = p->nInteger; break;
case SbxERROR:
case SbxUSHORT:
- if( p->nUShort > (USHORT) SbxMAXINT )
+ if( p->nUShort > (sal_uInt16) SbxMAXINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->nUShort;
+ nRes = (sal_Int16) p->nUShort;
break;
case SbxLONG:
if( p->nLong > SbxMAXINT )
@@ -74,7 +74,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) p->nLong;
+ nRes = (sal_Int16) p->nLong;
break;
case SbxULONG:
if( p->nULong > SbxMAXINT )
@@ -82,7 +82,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->nULong;
+ nRes = (sal_Int16) p->nULong;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXINT )
@@ -94,7 +94,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( p->nSingle );
+ nRes = (sal_Int16) ImpRound( p->nSingle );
break;
case SbxCURRENCY:
{
@@ -109,7 +109,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) (tstVal);
+ nRes = (sal_Int16) (tstVal);
break;
}
case SbxSALINT64:
@@ -122,7 +122,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) p->nInt64;
+ nRes = (sal_Int16) p->nInt64;
break;
case SbxSALUINT64:
if( p->uInt64 > SbxMAXINT )
@@ -130,7 +130,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->uInt64;
+ nRes = (sal_Int16) p->uInt64;
break;
case SbxDATE:
case SbxDOUBLE:
@@ -155,7 +155,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( dVal );
+ nRes = (sal_Int16) ImpRound( dVal );
break;
}
case SbxLPSTR:
@@ -178,7 +178,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( d );
+ nRes = (sal_Int16) ImpRound( d );
}
break;
case SbxOBJECT:
@@ -229,7 +229,7 @@ start:
return nRes;
}
-void ImpPutInteger( SbxValues* p, INT16 n )
+void ImpPutInteger( SbxValues* p, sal_Int16 n )
{
SbxValues aTmp;
start:
@@ -302,7 +302,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:
*p->pInteger = n; break;
@@ -312,15 +312,15 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *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:
if( n < 0 )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxCURRENCY:
*p->pnInt64 = n * CURRENCY_FACTOR; break;
case SbxBYREF | SbxSALINT64:
@@ -587,7 +587,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 )
@@ -598,7 +598,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 )
@@ -609,7 +609,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
@@ -619,7 +619,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
@@ -629,7 +629,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pSingle = (float) n; break;
case SbxBYREF | SbxDATE:
@@ -857,33 +857,33 @@ 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:
if( n > SbxMAXUINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXULNG;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pDouble = (float)ImpSalUInt64ToDouble( n ); break;
case SbxBYREF | SbxDATE:
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 10:08:08 +0000