diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:43:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:43:26 +0000 |
| commit | d7e704fc5c8f5f0678ad70dbf14966859f0613c9 (patch) | |
| tree | 8bc03cbab3b05a3c3060dac039cae52806f8ac82 /i18npool/source/calendar | |
| parent | 4170cbdbdfc9ceb282d25e1e19cd7b4d178436bf (diff) | |
INTEGRATION: CWS warnings01 (1.9.14); FILE MERGED
2006/03/08 13:19:09 nn 1.9.14.2: #i53898# warning-free code
2005/10/24 14:58:21 nn 1.9.14.1: #i53898# warning-free code
Diffstat (limited to 'i18npool/source/calendar')
| -rw-r--r-- | i18npool/source/calendar/calendar_jewish.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index 395cf26093b2..c2c7519526e6 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -4,9 +4,9 @@ * * $RCSfile: calendar_jewish.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-07 17:04:10 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:43:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,8 @@ using namespace ::rtl; #define ERROR RuntimeException() -static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call. +// not used +//static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call. Calendar_jewish::Calendar_jewish() { @@ -270,7 +271,7 @@ void SAL_CALL Calendar_jewish::mapFromGregorian() throw(RuntimeException) HebrewDate hd(Temp); fieldValue[CalendarFieldIndex::ERA] = hd.GetYear() <= 0 ? 0 : 1; - fieldValue[CalendarFieldIndex::MONTH] = hd.GetMonth() - 1; + fieldValue[CalendarFieldIndex::MONTH] = sal::static_int_cast<sal_Int16>( hd.GetMonth() - 1 ); fieldValue[CalendarFieldIndex::DAY_OF_MONTH] = (sal_Int16)hd.GetDay(); fieldValue[CalendarFieldIndex::YEAR] = (sal_Int16)(hd.GetYear() <= 0 ? 1 - hd.GetYear() : hd.GetYear()); } @@ -287,7 +288,7 @@ void SAL_CALL Calendar_jewish::mapToGregorian() throw(RuntimeException) GregorianDate gd(Temp); fieldSetValue[CalendarFieldIndex::ERA] = gd.GetYear() <= 0 ? 0 : 1; - fieldSetValue[CalendarFieldIndex::MONTH] = gd.GetMonth() - 1; + fieldSetValue[CalendarFieldIndex::MONTH] = sal::static_int_cast<sal_Int16>( gd.GetMonth() - 1 ); fieldSetValue[CalendarFieldIndex::DAY_OF_MONTH] = (sal_Int16)gd.GetDay(); fieldSetValue[CalendarFieldIndex::YEAR] = (sal_Int16)(gd.GetYear() <= 0 ? 1 - gd.GetYear() : gd.GetYear()); fieldSet |= FIELDS; |