diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 11:21:01 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 11:21:01 +0000 |
commit | 47f8f727f148e69180ad29e73c7ae8683ea27f23 (patch) | |
tree | b6b32ab7dacd16a7771d9b4017ff42e1677c8a94 | |
parent | WaE: gcc 4.6.0 various warnings (diff) | |
download | core-47f8f727f148e69180ad29e73c7ae8683ea27f23.tar.gz core-47f8f727f148e69180ad29e73c7ae8683ea27f23.zip |
WaE: gcc 4.6.0 various warnings
-rw-r--r-- | i18npool/inc/localedata.hxx | 2 | ||||
-rw-r--r-- | i18npool/source/localedata/localedata.cxx | 9 | ||||
-rw-r--r-- | i18npool/source/nativenumber/nativenumbersupplier.cxx | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 0c3418aa68c4..4cc240d3ebf9 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -132,7 +132,7 @@ private : getCalendarItemByName(const rtl::OUString& name, const com::sun::star::lang::Locale& rLocale, const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar >& calendarsSeq, - sal_Int16 len, sal_Int16 item) throw( com::sun::star::uno::RuntimeException ); + sal_Int16 item) throw( com::sun::star::uno::RuntimeException ); }; } } } } diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 78d404a697b8..ed300dcc5a61 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -459,7 +459,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( #define REF_ERAS 2 Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name, - const Locale& rLocale, const Sequence< Calendar >& calendarsSeq, sal_Int16 len, sal_Int16 item) + const Locale& rLocale, const Sequence< Calendar >& calendarsSeq, sal_Int16 item) throw(RuntimeException) { if (!ref_name.equals(name)) { @@ -472,7 +472,6 @@ Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name cals = calendarsSeq; } else { cals = getAllCalendars(loc); - len = sal::static_int_cast<sal_Int16>( cals.getLength() ); } const OUString& id = name.getToken(0, under, index); for (index = 0; index < cals.getLength(); index++) { @@ -520,7 +519,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) sal_Bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] ); offset++; if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) { - days = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_DAYS); + days = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_DAYS); offset += 2; } else { for(j = 0; j < allCalendars[0][i]; j++) { @@ -531,7 +530,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) } } if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) { - months = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_MONTHS); + months = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_MONTHS); offset += 2; } else { for(j = 0; j < allCalendars[1][i]; j++) { @@ -542,7 +541,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) } } if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) { - eras = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_ERAS); + eras = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_ERAS); offset += 2; } else { for(j = 0; j < allCalendars[2][i]; j++) { diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index c367be0a092e..cb170b6e1fd1 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -867,7 +867,6 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal sal_Int64 value = 0; sal_Int32 i, count = 0, len = aNumberString.getLength(); const sal_Unicode *src = aNumberString.getStr(); - sal_Bool neg = sal_False; for (i = 0; i < len; i++) { sal_Unicode ch = src[i]; @@ -877,7 +876,7 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal value = value * 10 + (ch - NUMBER_ZERO); } else if (isSeparator(ch) && count > 0) continue; - else if (isMinus(ch) && count == 0) neg = sal_True; + else if (isMinus(ch) && count == 0) continue; else break; } |