diff options
author | hg <hg@oosvn01.> | 2009-10-08 15:32:44 +0000 |
---|---|---|
committer | hg <hg@oosvn01.> | 2009-10-08 15:32:44 +0000 |
commit | 3e523c1a7633731154ef8b19b0e206bec5a348cf (patch) | |
tree | 7ed8d641626d24f481e1d5343dc2568cb15034aa /i18npool/source/calendar/calendar_gregorian.cxx | |
parent | c5046bc3c7966022c3688e930f0a8937e9cc563b (diff) | |
parent | fd7216ce2faff3891f45afc1d3ab4a4418851c70 (diff) |
merge with m44
Diffstat (limited to 'i18npool/source/calendar/calendar_gregorian.cxx')
-rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 8a19ce5bade9..96eee0772bc1 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -765,8 +765,8 @@ Calendar_gregorian::isValid() throw(RuntimeException) static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& aLocale, sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value ) { - sal_Bool isShort = (nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || - nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 100 || + sal_Bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || + nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 100) || nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER || nCalendarDisplayCode == CalendarDisplayCode::LONG_QUARTER; sal_Bool isChinese = aLocale.Language.equalsAscii("zh"); |