diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-02-22 22:43:02 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-02-22 22:45:11 -0500 |
| commit | 7ab87dce855a09a2c0e0563afe9229641bea3850 (patch) | |
| tree | 403346b2be17bea08c6a256d1aaa0160978a9de2 /i18npool | |
| parent | 680debe50b6c3e62ca82be368e09fa8cf423a373 (diff) | |
Accidentally changed the logic. Fixing it now.
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index bb8c988aff12..b6777a0343e0 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1293,11 +1293,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale LocaleDataLookupTableItem *pCachedItem = 0; - if (l <= 0) - // At minimum we need the lang name. - throw RuntimeException(); - - if (c > 0 && v > 0) + if (l > 0 && c > 0 && v > 0) { // load function with name <func>_<lang>_<country>_<variant> pSymbol = rLookupTable.getFunctionSymbolByName( @@ -1305,7 +1301,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale pFunction, &pCachedItem); } - if (!pSymbol && c > 0) + if (!pSymbol && l > 0 && c > 0) { // load function with name <ase>_<lang>_<country> pSymbol = rLookupTable.getFunctionSymbolByName( @@ -1313,7 +1309,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale pFunction, &pCachedItem); } - if (!pSymbol && c > 0 && + if (!pSymbol && l > 0 && c > 0 && rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && (rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HK")) || rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MO")))) |