* Patch from LacaK2 fixing else clause of vartobcd, bug #16853

git-svn-id: trunk@16584 -

rtl/objpas/fmtbcd.pp

@@ -1645,13 +1645,6 @@ IMPLEMENTATION
        _endSELECT;
      end;
 
-  function VarToBCD ( const aValue : Variant ) : tBCD;
-
-    begin
-      if VarIsFmtBCD(aValue) then
-        Result:=TFMTBcdVarData(TVarData(aValue).VPointer).BCD
-     end;
-
   function CurrToBCD ( const Curr : currency;
                          var BCD : tBCD;
                              Precision : Integer = 32;
@@ -3760,6 +3753,15 @@ begin
     end;
 end;
 
+function VarToBCD ( const aValue : Variant ) : tBCD;
+  begin
+    if VarIsFmtBCD(aValue) then
+      Result:=TFMTBcdVarData(TVarData(aValue).vPointer).BCD
+    else
+      Result:=VariantToBCD(TVarData(aValue));
+   end;
+
+
 constructor TFMTBcdVarData.create;
   begin
     inherited create;