eliminated lookupFallbackLocale(LanguageType)

Change-Id: I2a2a983acbd8af0487e7148f9dee2a73dc314891

3 files changed, 3 insertions, 74 deletions

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 6f4af1cb0e27..e16e230d5535 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -713,73 +713,6 @@ void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang,
 
 // -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
-
-static const MsLangId::IsoLangEntry & lcl_lookupFallbackEntry( LanguageType nLang )
-{
-    LanguageType nPrimary = MsLangId::getPrimaryLanguage( nLang);
-
-    // Search for LangID and remember first lang-only.
-    const MsLangId::IsoLangEntry* pFirstPrimary = NULL;
-    const MsLangId::IsoLangEntry* pEntry = aImplIsoLangEntries;
-    do
-    {
-        if (pEntry->mnLang == nLang)
-        {
-            if (*pEntry->maCountry)
-                return *pEntry;
-            switch (nLang)
-            {
-                // These are known to have no country assigned.
-                case LANGUAGE_BASQUE:
-                case LANGUAGE_USER_ESPERANTO:
-                case LANGUAGE_USER_INTERLINGUA:
-                case LANGUAGE_USER_LOJBAN:
-                    return *pEntry;
-                default:
-                    ;   // nothing
-            }
-        }
-        if (!pFirstPrimary &&
-                MsLangId::getPrimaryLanguage( pEntry->mnLang) == nPrimary)
-            pFirstPrimary = pEntry;
-        ++pEntry;
-    }
-    while ( pEntry->mnLang != LANGUAGE_DONTKNOW );
-
-    // Language not found at all => use default.
-    if (!pFirstPrimary)
-        return aLastResortFallbackEntry;
-
-    // Search for first entry of primary language with any country.
-    pEntry = pFirstPrimary;
-    do
-    {
-        if (MsLangId::getPrimaryLanguage( pEntry->mnLang) == nLang)
-        {
-            if (*pEntry->maCountry)
-                return *pEntry;
-        }
-        ++pEntry;
-    }
-    while ( pEntry->mnLang != LANGUAGE_DONTKNOW );
-
-    return aLastResortFallbackEntry;
-}
-
-
-// static
-::com::sun::star::lang::Locale MsLangId::Conversion::lookupFallbackLocale( LanguageType nLang )
-{
-    const MsLangId::IsoLangEntry& rEntry = lcl_lookupFallbackEntry( nLang);
-    return ::com::sun::star::lang::Locale(
-            OUString::createFromAscii( rEntry.maLangStr),
-            OUString::createFromAscii( rEntry.maCountry),
-            OUString());
-}
-
-// -----------------------------------------------------------------------
-
 static const MsLangId::IsoLangEntry & lcl_lookupFallbackEntry(
         const ::com::sun::star::lang::Locale & rLocale )
 {
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index f488e9cd6037..2e9ca7e938a6 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -195,9 +195,9 @@ LanguageType MsLangId::Conversion::convertLocaleToLanguage(
 {
     // empty language => LANGUAGE_SYSTEM
     if (rLocale.Language.isEmpty())
-        return Conversion::lookupFallbackLocale( MsLangId::getRealLanguage( LANGUAGE_SYSTEM));
-
-    return Conversion::lookupFallbackLocale( rLocale);
+        return Conversion::lookupFallbackLocale( Conversion::convertLanguageToLocale( LANGUAGE_SYSTEM, true));
+    else
+        return Conversion::lookupFallbackLocale( rLocale);
 }
 
 // static
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index c57f5288f7bd..da2e199149a7 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -249,10 +249,6 @@ public:
 
         I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale(
                 const ::com::sun::star::lang::Locale & rLocale );
-
-        /** Used by getFallbackLocale(Locale) */
-        I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale(
-                LanguageType nLang );
     };
 
 private: