|
@@ -833,25 +833,19 @@ var
|
|
begin
|
|
begin
|
|
s := WideString(p);
|
|
s := WideString(p);
|
|
|
|
|
|
- if not (TryStrToDateTime(s, Result) or
|
|
|
|
- TryStrToDate(s, Result) or
|
|
|
|
- TryStrToTime(s, Result)) then
|
|
|
|
|
|
+ if not TryStrToDateTime(s, Result) then
|
|
VariantTypeMismatch(varOleStr, varDate);
|
|
VariantTypeMismatch(varOleStr, varDate);
|
|
end;
|
|
end;
|
|
|
|
|
|
Function LStrToDate(p: Pointer) : TDateTime;
|
|
Function LStrToDate(p: Pointer) : TDateTime;
|
|
begin
|
|
begin
|
|
- if not (TryStrToDateTime(AnsiString(p), Result) or
|
|
|
|
- TryStrToDate(AnsiString(p), Result) or
|
|
|
|
- TryStrToTime(AnsiString(p), Result)) then
|
|
|
|
|
|
+ if not TryStrToDateTime(AnsiString(p), Result) then
|
|
VariantTypeMismatch(varString, varDate);
|
|
VariantTypeMismatch(varString, varDate);
|
|
end;
|
|
end;
|
|
|
|
|
|
Function UStrToDate(p: Pointer) : TDateTime;
|
|
Function UStrToDate(p: Pointer) : TDateTime;
|
|
begin
|
|
begin
|
|
- if not (TryStrToDateTime(UnicodeString(p), Result) or
|
|
|
|
- TryStrToDate(UnicodeString(p), Result) or
|
|
|
|
- TryStrToTime(UnicodeString(p), Result)) then
|
|
|
|
|
|
+ if not TryStrToDateTime(UnicodeString(p), Result) then
|
|
VariantTypeMismatch(varUString, varDate);
|
|
VariantTypeMismatch(varUString, varDate);
|
|
end;
|
|
end;
|
|
|
|
|