organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-09 15:27:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-1085 make first day of week and minimal days of first week invalidate fields; enforce valid range

Browse source 
X-SVN-Rev: 11352
This commit is contained in:
Alan Liu 2003-03-18 18:17:24 +00:00
parent ac193fe881
commit 239bd7b7e2
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
icu4c/source/i18n/calendar.cpp
View file

@ -661,7 +661,11 @@ Calendar::isLenient() const
void
Calendar::setFirstDayOfWeek(UCalendarDaysOfWeek value)
{
fFirstDayOfWeek = value;
if (fFirstDayOfWeek != value &&
value >= UCAL_SUNDAY && value <= SATURDAY) {
fFirstDayOfWeek = value;
fAreFieldsSet = FALSE;
}
}
// -------------------------------------
@ -677,7 +681,18 @@ Calendar::getFirstDayOfWeek() const
void
Calendar::setMinimalDaysInFirstWeek(uint8_t value)
{
fMinimalDaysInFirstWeek = value;
// Values less than 1 have the same effect as 1; values greater
// than 7 have the same effect as 7. However, we normalize values
// so operator== and so forth work.
if (value < 1) {
value = 1;
} else if (value > 7) {
value = 7;
}
if (fMinimalDaysInFirstWeek != value) {
fMinimalDaysInFirstWeek = value;
fAreFieldsSet = FALSE;
}
}
// -------------------------------------