Преглед на файлове

Merged revisions 12561 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r12561 | joost | 2009-01-18 17:05:04 +0100 (Sun, 18 Jan 2009) | 1 line

* Fixed TryEncodeDateTime. Adding a date and a time is not valid for dates before 1899-12-30, use ComposeDateTime instead
........

git-svn-id: branches/fixes_2_2@12662 -

joost преди 16 години
родител
ревизия
af3c443b5c
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      rtl/objpas/dateutil.inc

+ 1 - 1
rtl/objpas/dateutil.inc

@@ -1509,7 +1509,7 @@ begin
   Result:=TryEncodeDate(AYear,AMonth,ADay,AValue);
   Result:=Result and TryEncodeTime(AHour,AMinute,ASecond,Amillisecond,Tmp);
   If Result then
-    Avalue:=AValue+Tmp;
+    Avalue:=ComposeDateTime(AValue,Tmp);
 end;
 
 { ---------------------------------------------------------------------