reindentation
Monotone-Parent: 907dbd9fa2ff06e6c840c14c9f7904a6bcc517b6 Monotone-Revision: 006880968b9bb9ad30735d48958c2b1ad1396bce Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-18T23:06:50 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
38092f7582
commit
6d8d1b3dd3
|
@ -139,14 +139,14 @@
|
||||||
tzStart = [self startDate];
|
tzStart = [self startDate];
|
||||||
[tzStart setTimeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
|
[tzStart setTimeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
|
||||||
tmpDate = [NSCalendarDate dateWithYear: [refDate yearOfCommonEra]
|
tmpDate = [NSCalendarDate dateWithYear: [refDate yearOfCommonEra]
|
||||||
month: [[rrule namedValue: @"bymonth"] intValue]
|
month: [[rrule namedValue: @"bymonth"] intValue]
|
||||||
day: 1 hour: [tzStart hourOfDay]
|
day: 1 hour: [tzStart hourOfDay]
|
||||||
minute: [tzStart minuteOfHour] second: 0
|
minute: [tzStart minuteOfHour] second: 0
|
||||||
timeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
|
timeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
|
||||||
tmpDate = [tmpDate addYear: 0 month: ((pos > 0) ? 0 : 1)
|
tmpDate = [tmpDate addYear: 0 month: ((pos > 0) ? 0 : 1)
|
||||||
day: 0 hour: 0 minute: 0
|
day: 0 hour: 0 minute: 0
|
||||||
second: -[self _secondsOfOffset: @"tzoffsetfrom"]];
|
second: -[self _secondsOfOffset: @"tzoffsetfrom"]];
|
||||||
|
|
||||||
dateDayOfWeek = [tmpDate dayOfWeek];
|
dateDayOfWeek = [tmpDate dayOfWeek];
|
||||||
|
|
||||||
/* If the day of the time change is "-XSU", we need to determine whether the
|
/* If the day of the time change is "-XSU", we need to determine whether the
|
||||||
|
@ -158,8 +158,8 @@
|
||||||
|
|
||||||
offset = (dayOfWeek - dateDayOfWeek) + (pos * 7);
|
offset = (dayOfWeek - dateDayOfWeek) + (pos * 7);
|
||||||
tmpDate = [tmpDate addYear: 0 month: 0 day: offset
|
tmpDate = [tmpDate addYear: 0 month: 0 day: offset
|
||||||
hour: 0 minute: 0 second: 0];
|
hour: 0 minute: 0 second: 0];
|
||||||
|
|
||||||
return tmpDate;
|
return tmpDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue