Browse Source

--- Merging r22679 into '.':
U rtl/objpas/sysutils/dati.inc

# revisions: 22679
fetching log for rev 22679 - 323 characters
r22679 | michael | 2012-10-17 09:15:01 +0200 (Wed, 17 Oct 2012) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/dati.inc

* Fix dayOfWeek for dates < 0 (bug ID #23144)

git-svn-id: branches/fixes_2_6@22680 -

marco 13 years ago
parent
commit
e6e0ea17ca
1 changed files with 4 additions and 2 deletions
  1. 4 2
      rtl/objpas/sysutils/dati.inc

+ 4 - 2
rtl/objpas/sysutils/dati.inc

@@ -220,8 +220,10 @@ end ;
 
 function DayOfWeek(DateTime: TDateTime): integer;
 begin
-  Result := 1 + (Abs(Trunc(DateTime) - 1) mod 7);
-end ;
+  Result := 1 + ((Trunc(DateTime) - 1) mod 7);
+  If (Result<=0) then
+    Inc(Result,7);
+end;
 
 {   Date returns the current Date   }