[Libreoffice-commits] .: Branch 'feature/currency-64bit' - basic/source

[Noel Power]

 basic/source/runtime/methods1.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit c2553e86af652f80c8e5dae0795e23d69d6cc2d8
Author: Noel Power <noel.power at novell.com>
Date:   Wed Dec 15 09:17:40 2010 +0000

    enable lcl_Read/writeSbxVariable for SbxSALINT64/SbxSALUINT64 types

diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 54768cc..36af58b 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -885,15 +885,12 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
                     *pStrm << (USHORT)SbxLONG; // VarType Id
                 *pStrm << rVar.GetLong();
                 break;
-#if IMPLEMENTATION_READY
         case SbxSALINT64:
         case SbxSALUINT64:
                 if( bIsVariant )
                     *pStrm << (USHORT)SbxSALINT64; // VarType Id
-                //TODO fix truncating cast with new stream method or 2 part print
-                *pStrm << (sal_Int32)rVar.GetInt64();
+                *pStrm << (sal_uInt64)rVar.GetInt64();
                 break;
-#endif
         case SbxSINGLE:
                 if( bIsVariant )
                     *pStrm << (USHORT)eType; // VarType Id
@@ -995,17 +992,14 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
                 rVar.PutLong( aInt );
                 }
                 break;
-#if IMPLEMENTATION_READY
         case SbxSALINT64:
         case SbxSALUINT64:
                 {
-                sal_Int32 aInt;
-                //TODO fix incorrect use of 32bit type with new stream method in tools
+                sal_uInt32 aInt;
                 *pStrm >> aInt;
                 rVar.PutInt64( (sal_Int64)aInt );
                 }
                 break;
-#endif
         case SbxSINGLE:
                 {
                 float nS;