paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-14 14:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed range check error and simplified valid date test

Browse Source 
git-svn-id: trunk@6834 -
This commit is contained in:
vincents 2005-02-25 10:20:53 +00:00
parent de0911a9c8
commit 3823e16050
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/calendar.pp
View File

@ -223,21 +223,16 @@ end;
procedure TCustomCalendar.SetDateTime(const AValue: TDateTime);
{$IFDEF WIN32}
var
NewestCalendarMinDate,NewestCalendarMaxDate,OldestMinDate,OldestMaxDate:integer;
CalendarMinDate,CalendarMaxDate: integer;
{$ENDIF}
begin
if AValue=FDate then exit;
{$IFDEF WIN32}
NewestCalendarMinDate:=0;
NewestCalendarMaxDate:=trunc(MaxDateTime);
OldestMinDate:=4294913499;
OldestMaxDate:=4294967295;
if not(((AValue>=NewestCalendarMinDate)and(AValue<=NewestCalendarMaxDate))or
((AValue>=OldestMinDate)and(AValue<=OldestMaxDate)))then begin
raise EInvalidDate.CreateFmt(rsInvalidDate, ['must be in '+
DateToStr(OldestMinDate)+'-'+DateToStr(NewestCalendarMaxDate)]);
exit
end;
{$IFDEF WIN32} // TODO: move this test to the win32 interface?
CalendarMinDate:=-53787;// 14 sep 1752, start of Gregorian calendar in England
CalendarMaxDate:=trunc(MaxDateTime);
if not ((AValue>=CalendarMinDate)and(AValue<=CalendarMaxDate)) then
raise EInvalidDate.CreateFmt(rsInvalidDateRangeHint, [DateToStr(AValue),
DateToStr(CalendarMinDate), DateToStr(CalendarMaxDate)]);
{$ENDIF}
FDate:=AValue;
FDateAsString:=FormatDateTime(ShortDateFormat,FDate);

3
lcl/lclstrconsts.pas
View File

@ -156,7 +156,8 @@ ResourceString
rsErrorReadingProperty = 'Error reading %s%s%s: %s';
rsInvalidFormObjectStream = 'invalid Form object stream';
rsScrollBarOutOfRange = 'ScrollBar property out of range';
rsInvalidDate = 'Invalid Date :%s';
rsInvalidDate = 'Invalid Date : %s';
rsInvalidDateRangeHint = 'Invalid Date: %s. Must be between %s and %s';
rsErrorOccurredInAtAddressFrame = 'Error occurred in %s at %sAddress %s%s'
+' Frame %s';
rsException = 'Exception';