From 7ab87dce855a09a2c0e0563afe9229641bea3850 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 22 Feb 2011 22:43:02 -0500 Subject: Accidentally changed the logic. Fixing it now. --- i18npool/source/localedata/localedata.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'i18npool') 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 ___ 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 __ 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")))) -- cgit