* Fix bug ID #31814, StrToDateTimeDef with FormatSettings parameter

git-svn-id: trunk@36214 -

rtl/objpas/sysutils/dati.inc

@@ -1433,7 +1433,12 @@ end;
 
 function StrToDateTimeDef(const S: ShortString; const Defvalue : TDateTime): TDateTime;
 begin
-  if not TryStrToDateTime(s,Result) Then
+  Result:=StrToDateTimeDef(S,DefValue,DefaultFormatSettings);
+end;
+
+function StrToDateTimeDef(const S: AnsiString; const Defvalue : TDateTime; const FormatSettings: TFormatSettings): TDateTime;
+begin
+  if not TryStrToDateTime(s,Result,FormatSettings) Then
     result:=defvalue;
 end;
 

rtl/objpas/sysutils/datih.inc

@@ -188,6 +188,7 @@ function StrToDateDef(const S: AnsiString; const Defvalue : TDateTime; separator
 function StrToTimeDef(const S: AnsiString; const Defvalue : TDateTime): TDateTime;                   {$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToTimeDef(const S: AnsiString; const Defvalue : TDateTime; separator : char): TDateTime; {$ifdef SYSUTILSINLINE}inline;{$endif}
 function StrToDateTimeDef(const S: AnsiString; const Defvalue : TDateTime): TDateTime;               {$ifdef SYSUTILSINLINE}inline;{$endif}
+function StrToDateTimeDef(const S: AnsiString; const Defvalue : TDateTime; const FormatSettings: TFormatSettings): TDateTime;               {$ifdef SYSUTILSINLINE}inline;{$endif}
 
 function CurrentYear:Word;
 { FPC Extra }