[Libreoffice-commits] .: i18npool/source

[Kohei Yoshida]

 i18npool/source/localedata/localedata.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 367a658bb537c964be3f940ce24b81e6666a688b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Feb 22 22:43:02 2011 -0500

    Accidentally changed the logic. Fixing it now.

diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f0d13f7..f28c618 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"))))