Apache OpenOffice (AOO) Bugzilla – Issue 99765
i18npool: isShort test looks a little strange...
Last modified: 2013-08-07 15:02:13 UTC
in i18npoo/source/calendar/calendar_gregorian.cxx we have... sal_Bool isShort = (nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 100 || nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER || nCalendarDisplayCode == CalendarDisplayCode::LONG_QUARTER; which looks a little strange, "isShort". Attached is version1 which keeps things exactly as they are, except adding some brackets to keep new gcc quiet. But the isShort = (_YEAR && value >= 100) looks kind of odd, is that really what we want ? Not e.g. isShort == SHORT_YEAR || (LONG_YEAR && value < 100) ?
Created attachment 60577 [details] keep as it is
Created attachment 60578 [details] random change to logic that "reads" better
This indeed looks a bit strange, but it may be just because of the name 'isShort' of the variable.. the CJK requirements aren't clear to me. @khong: Karl, was the original logic really intended?
Yes, that is intended. What it says is if it is year part, no matter it is LONG or SHORT, and year is less than 100, it should use another format. Example, for Taiwan, current year is ROC 98, it should show as 九十八, not 九八. While Gregorian 1998 shows as 一九九八 for LONG_YEAR and 九八 for SHORT_YEAR. First patch is ok, second one is not right, which show 九八 for ROC 98. I agree the name 'isShort' is misleading. 'keepFormat' may be more suitable.
ok, thanks. I'll just commit the first one into cmcfixes55 then to silence the extra new-gcc warnings
done in cmcfixes55
Can you code-review these changes in cmcfixes55 and set each to verified if correct
Verified in cmcfixes55.
done m44