1 files changed, 19 insertions, 35 deletions

diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 578f0cfb8adf..ee4cb48b8efb 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,11 +32,6 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-// AB 29.10.99 Unicode
-#ifndef _USE_NO_NAMESPACE
-using namespace rtl;
-#endif
-
 xub_Unicode ImpGetChar( const SbxValues* p )
 {
     SbxValues aTmp;
@@ -85,8 +81,15 @@ start:
             else
                 nRes = (xub_Unicode) p->nULong;
             break;
+        case SbxCURRENCY:
         case SbxSALINT64:
-            if( p->nInt64 > SbxMAXCHAR )
+        {
+            sal_Int64 val = p->nInt64;
+
+            if ( p->eType == SbxCURRENCY )
+                val = val / CURRENCY_FACTOR;
+
+            if( val > SbxMAXCHAR )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXCHAR;
             }
@@ -95,8 +98,9 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (xub_Unicode) p->nInt64;
+                nRes = (xub_Unicode) val;
             break;
+        }
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXCHAR )
             {
@@ -119,20 +123,11 @@ start:
             break;
         case SbxDATE:
         case SbxDOUBLE:
-        case SbxLONG64:
-        case SbxULONG64:
-        case SbxCURRENCY:
         case SbxDECIMAL:
         case SbxBYREF | SbxDECIMAL:
             {
             double dVal;
-            if( p->eType == SbxCURRENCY )
-                dVal = ImpCurrencyToDouble( p->nLong64 );
-            else if( p->eType == SbxLONG64 )
-                dVal = ImpINT64ToDouble( p->nLong64 );
-            else if( p->eType == SbxULONG64 )
-                dVal = ImpUINT64ToDouble( p->nULong64 );
-            else if( p->eType == SbxDECIMAL )
+            if( p->eType == SbxDECIMAL )
             {
                 dVal = 0.0;
                 if( p->pDecimal )
@@ -188,7 +183,7 @@ start:
 
         case SbxBYREF | SbxCHAR:
             nRes = *p->pChar; break;
-        // ab hier wird getestet
+        // from here on will be tested
         case SbxBYREF | SbxBYTE:
             aTmp.nByte = *p->pByte; goto ref;
         case SbxBYREF | SbxINTEGER:
@@ -206,11 +201,7 @@ start:
         case SbxBYREF | SbxDATE:
         case SbxBYREF | SbxDOUBLE:
             aTmp.nDouble = *p->pDouble; goto ref;
-        case SbxBYREF | SbxULONG64:
-            aTmp.nULong64 = *p->pULong64; goto ref;
-        case SbxBYREF | SbxLONG64:
         case SbxBYREF | SbxCURRENCY:
-            aTmp.nLong64 = *p->pLong64; goto ref;
         case SbxBYREF | SbxSALINT64:
             aTmp.nInt64 = *p->pnInt64; goto ref;
         case SbxBYREF | SbxSALUINT64:
@@ -243,21 +234,17 @@ start:
         case SbxDATE:
         case SbxDOUBLE:
             p->nDouble = n; break;
+        case SbxCURRENCY:
+            p->nInt64 = n * CURRENCY_FACTOR; break;
         case SbxSALINT64:
             p->nInt64 = n; break;
         case SbxSALUINT64:
             p->uInt64 = n; break;
-        case SbxULONG64:
-            p->nULong64 = ImpDoubleToUINT64( (double)n ); break;
-        case SbxLONG64:
-            p->nLong64 = ImpDoubleToINT64( (double)n ); break;
-        case SbxCURRENCY:
-            p->nLong64 = ImpDoubleToCurrency( (double)n ); break;
         case SbxBYREF | SbxDECIMAL:
             ImpCreateDecimal( p )->setChar( n );
             break;
 
-        // ab hier wird getestet
+        // from here on will be tested
         case SbxBYTE:
             aTmp.pByte = &p->nByte; goto direct;
         case SbxULONG:
@@ -305,16 +292,12 @@ start:
         case SbxBYREF | SbxDATE:
         case SbxBYREF | SbxDOUBLE:
             *p->pDouble = (double) n; break;
+        case SbxBYREF | SbxCURRENCY:
+            p->nInt64 = n * CURRENCY_FACTOR; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = n; break;
         case SbxBYREF | SbxSALUINT64:
             *p->puInt64 = n; break;
-        case SbxBYREF | SbxULONG64:
-            *p->pULong64 = ImpDoubleToUINT64( (double)n ); break;
-        case SbxBYREF | SbxLONG64:
-            *p->pLong64 = ImpDoubleToINT64( (double)n ); break;
-        case SbxBYREF | SbxCURRENCY:
-            *p->pLong64 = ImpDoubleToCurrency( (double)n ); break;
 
         default:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -322,3 +305,4 @@ start:
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */