diff options
| author | Noel Power <noel.power@novell.com> | 2010-12-21 15:04:14 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-12-21 15:04:14 +0000 |
| commit | 9cc9b6dccbdecfe2877a5735672d7f9bb38d0235 (patch) | |
| tree | 9f3af00f8d61a6cbaf825ed64ec67d785b5eef03 /basic/source/runtime/methods1.cxx | |
| parent | 7f2458dec64aec8a2462f1e6adeabcf27120c857 (diff) | |
revert Merge remote branch origin/feature/currency-64bit
Diffstat (limited to 'basic/source/runtime/methods1.cxx')
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 4c4cecb08b04..b922b556bd2c 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -158,12 +158,12 @@ RTLFUNC(CByte) // JSM rPar.Get(0)->PutByte(nByte); } -RTLFUNC(CCur) +RTLFUNC(CCur) // JSM { (void)pBasic; (void)bWrite; - sal_Int64 nCur = 0; + SbxINT64 nCur; if ( rPar.Count() == 2 ) { SbxVariable *pSbxVariable = rPar.Get(1); @@ -175,7 +175,7 @@ RTLFUNC(CCur) rPar.Get(0)->PutCurrency( nCur ); } -RTLFUNC(CDec) +RTLFUNC(CDec) // JSM { (void)pBasic; (void)bWrite; @@ -881,16 +881,13 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, case SbxLONG: case SbxULONG: + case SbxLONG64: + case SbxULONG64: if( bIsVariant ) *pStrm << (USHORT)SbxLONG; // VarType Id *pStrm << rVar.GetLong(); break; - case SbxSALINT64: - case SbxSALUINT64: - if( bIsVariant ) - *pStrm << (USHORT)SbxSALINT64; // VarType Id - *pStrm << (sal_uInt64)rVar.GetInt64(); - break; + case SbxSINGLE: if( bIsVariant ) *pStrm << (USHORT)eType; // VarType Id @@ -986,20 +983,15 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, case SbxLONG: case SbxULONG: + case SbxLONG64: + case SbxULONG64: { INT32 aInt; *pStrm >> aInt; rVar.PutLong( aInt ); } break; - case SbxSALINT64: - case SbxSALUINT64: - { - sal_uInt32 aInt; - *pStrm >> aInt; - rVar.PutInt64( (sal_Int64)aInt ); - } - break; + case SbxSINGLE: { float nS; @@ -1362,8 +1354,8 @@ RTLFUNC(TypeLen) case SbxDOUBLE: case SbxCURRENCY: case SbxDATE: - case SbxSALINT64: - case SbxSALUINT64: + case SbxLONG64: + case SbxULONG64: nLen = 8; break; |