mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-10-28 10:01:51 +01:00
* v.vtype=varString -> double fixed
git-svn-id: trunk@564 -
This commit is contained in:
parent
227b2c392a
commit
a440df217b
@ -209,8 +209,6 @@ Function VariantToSingle(Const VargSrc : TVarData) : Single;
|
|||||||
|
|
||||||
|
|
||||||
Function VariantToDouble(Const VargSrc : TVarData) : Double;
|
Function VariantToDouble(Const VargSrc : TVarData) : Double;
|
||||||
var
|
|
||||||
e : extended;
|
|
||||||
begin
|
begin
|
||||||
With VargSrc do
|
With VargSrc do
|
||||||
Case (VType and VarTypeMask) of
|
Case (VType and VarTypeMask) of
|
||||||
@ -225,13 +223,6 @@ Function VariantToDouble(Const VargSrc : TVarData) : Double;
|
|||||||
begin
|
begin
|
||||||
if not(TryStrToFloat(WideCharToString(vOleStr),Result)) then
|
if not(TryStrToFloat(WideCharToString(vOleStr),Result)) then
|
||||||
VariantTypeMismatch;
|
VariantTypeMismatch;
|
||||||
result:=e;
|
|
||||||
end;
|
|
||||||
VarString :
|
|
||||||
begin
|
|
||||||
if not(TryStrToFloat(ansistring(vString),Result)) then
|
|
||||||
VariantTypeMismatch;
|
|
||||||
result:=e;
|
|
||||||
end;
|
end;
|
||||||
VarBoolean : Result:=Longint(VBoolean);
|
VarBoolean : Result:=Longint(VBoolean);
|
||||||
VarByte : Result:=VByte;
|
VarByte : Result:=VByte;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user