浏览代码

* currency updates

peter 23 年之前
父节点
当前提交
5b66a821e4
共有 1 个文件被更改,包括 13 次插入2 次删除
  1. 13 2
      rtl/objpas/cvarutil.inc

+ 13 - 2
rtl/objpas/cvarutil.inc

@@ -330,7 +330,11 @@ begin
         VarInteger : Result:=VInteger;
         VarInteger : Result:=VInteger;
         VarSingle  : Result:=Trunc(VSingle);
         VarSingle  : Result:=Trunc(VSingle);
         VarDouble  : Result:=Trunc(VDouble);
         VarDouble  : Result:=Trunc(VDouble);
+{$ifdef HASCURRENCY}
+        VarCurrency: Result:=Trunc(VCurrency);
+{$else}
         VarCurrency: Result:=VCurrency;
         VarCurrency: Result:=VCurrency;
+{$endif}
         VarDate    : Result:=Trunc(VDate);
         VarDate    : Result:=Trunc(VDate);
         VarOleStr  : NoWideStrings;
         VarOleStr  : NoWideStrings;
         VarBoolean : Result:=Longint(VBoolean);
         VarBoolean : Result:=Longint(VBoolean);
@@ -361,7 +365,11 @@ begin
         VarInteger : Result:=VInteger;
         VarInteger : Result:=VInteger;
         VarSingle  : Result:=Trunc(VSingle);
         VarSingle  : Result:=Trunc(VSingle);
         VarDouble  : Result:=Trunc(VDouble);
         VarDouble  : Result:=Trunc(VDouble);
+{$ifdef HASCURRENCY}
+        VarCurrency: Result:=Trunc(VCurrency);
+{$else}
         VarCurrency: Result:=VCurrency;
         VarCurrency: Result:=VCurrency;
+{$endif}
         VarDate    : Result:=Trunc(VDate);
         VarDate    : Result:=Trunc(VDate);
         VarOleStr  : NoWideStrings;
         VarOleStr  : NoWideStrings;
         VarBoolean : Result:=Longint(VBoolean);
         VarBoolean : Result:=Longint(VBoolean);
@@ -395,7 +403,7 @@ begin
         VarInteger  : Result:=IntToStr(VInteger);
         VarInteger  : Result:=IntToStr(VInteger);
         VarSingle   : Result:=FloatToStr(VSingle);
         VarSingle   : Result:=FloatToStr(VSingle);
         VarDouble   : Result:=FloatToStr(VDouble);
         VarDouble   : Result:=FloatToStr(VDouble);
-        VarCurrency : Result:=IntToStr(VCurrency);
+        VarCurrency : Result:=FloatToStr(VCurrency);
         VarDate     : Result:=DateTimeToStr(VDate);
         VarDate     : Result:=DateTimeToStr(VDate);
         VarOleStr   : Result:=WideString(Pointer(VOleStr));
         VarOleStr   : Result:=WideString(Pointer(VOleStr));
         VarBoolean  : Result:=BS[VBoolean];
         VarBoolean  : Result:=BS[VBoolean];
@@ -539,7 +547,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2001-11-17 10:29:48  florian
+  Revision 1.6  2002-07-01 16:25:10  peter
+    * currency updates
+
+  Revision 1.5  2001/11/17 10:29:48  florian
     * make cycle for win32 fixed
     * make cycle for win32 fixed
 
 
   Revision 1.4  2001/11/15 22:33:14  michael
   Revision 1.4  2001/11/15 22:33:14  michael