From b7a56722ff2725761428a9bc9eae82df77c5dc35 Mon Sep 17 00:00:00 2001
From: sergei <gorelkin@nanoreflex.ru>
Date: Thu, 7 Apr 2011 04:10:54 +0000
Subject: [PATCH] * Cleanup variant->string conversions: TryStrToDate and
 TryStrToTime are redundant because TryStrToDateTime already does the same
 checks. Patch from Luiz Americo, resolves #19115.

git-svn-id: trunk@17265 -
---
 rtl/objpas/cvarutil.inc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/rtl/objpas/cvarutil.inc b/rtl/objpas/cvarutil.inc
index dbf16ebd89..65c3a67f2c 100644
--- a/rtl/objpas/cvarutil.inc
+++ b/rtl/objpas/cvarutil.inc
@@ -833,25 +833,19 @@ var
 begin
   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);
 end;
 
 Function LStrToDate(p: Pointer) : TDateTime;
 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);
 end;
 
 Function UStrToDate(p: Pointer) : TDateTime;
 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);
 end;