--- Merging r25392 into '.':

U    rtl/objpas/sysutils/dati.inc
U    rtl/objpas/sysutils/datih.inc

# revisions: 25392
r25392 | svenbarth | 2013-09-01 14:46:54 +0200 (Sun, 01 Sep 2013) | 7 lines
Changed paths:
   M /trunk/rtl/objpas/sysutils/dati.inc
   M /trunk/rtl/objpas/sysutils/datih.inc

Fix for Mantis #24929.

rtl/sysutils/datih.inc:
  + add StrToDate overload which allows passing of specific TFormatSettings parameter
rtl/sysutils/dati.inc:
  * implement new StrToDate overload by calling IntStrToDate similar to StrToTime


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_6@25926 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 10 insertions, 0 deletions

diff --git a/rtl/objpas/sysutils/dati.inc b/rtl/objpas/sysutils/dati.inc
index 3e0f901f78..832bbc0f48 100644
--- a/rtl/objpas/sysutils/dati.inc
+++ b/rtl/objpas/sysutils/dati.inc
@@ -502,6 +502,15 @@ begin
     Raise EConvertError.Create(Msg);
 end;
 
+function StrToDate(const S: string; FormatSettings: TFormatSettings): TDateTime;
+var
+  Msg: AnsiString;
+begin
+  Result:=IntStrToDate(Msg,@S[1],Length(S),FormatSettings.ShortDateFormat,FormatSettings);
+  if Msg<>'' then
+    raise EConvertError.Create(Msg);
+end;
+
 function StrToDate(const S: ShortString; const useformat : string; separator : char = #0): TDateTime;
 begin
     result := StrToDate(@S[1],Length(s),UseFormat,separator);
diff --git a/rtl/objpas/sysutils/datih.inc b/rtl/objpas/sysutils/datih.inc
index 783a427a01..b8dde2ea2b 100644
--- a/rtl/objpas/sysutils/datih.inc
+++ b/rtl/objpas/sysutils/datih.inc
@@ -125,6 +125,7 @@ function StrToDate(const S: ShortString): TDateTime;                  {$ifdef SY
 function StrToDate(const S: Ansistring): TDateTime;                   {$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToDate(const S: ShortString; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToDate(const S: AnsiString; separator : char): TDateTime; {$ifdef SYSUTILSINLINE}inline;{$endif}
+function StrToDate(const S: string; FormatSettings : TFormatSettings): TDateTime;
 function StrToTime(const S: Shortstring): TDateTime;                  {$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToTime(const S: Ansistring): TDateTime;                   {$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToTime(const S: ShortString; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif}