extra convertLanguageToLocale(LanguageType,Locale) is unneeded

Change-Id: I3a56e7cafeb2453b877582f6c2d1a705cb91723b

i18nlangtag/source/isolang/mslangid.cxx

@@ -141,22 +141,6 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
     return nLang;
 }
 
-// static
-void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang,
-        ::com::sun::star::lang::Locale & rLocale )
-{
-    if (!rLocale.Variant.isEmpty())
-        rLocale.Variant = OUString();
-    convertLanguageToIsoNames( nLang, rLocale.Language, rLocale.Country);
-    /* FIXME: this x-... is temporary until conversion will be moved up to
-     * LanguageTag. Also handle the nasty "*" joker as privateuse. */
-    if (rLocale.Language.startsWith( "x-") || (rLocale.Language == "*"))
-    {
-        rLocale.Variant = rLocale.Language;
-        rLocale.Language = "qlt";
-    }
-}
-
 
 // static
 ::com::sun::star::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
@@ -171,7 +155,14 @@ void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang,
         // but not LANGUAGE_SYSTEM or others.
         if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
             nLang = MsLangId::getRealLanguage( nLang);
-        convertLanguageToLocale( nLang, aLocale);
+        convertLanguageToIsoNames( nLang, aLocale.Language, aLocale.Country);
+        /* FIXME: this x-... is temporary until conversion will be moved up to
+         * LanguageTag. Also handle the nasty "*" joker as privateuse. */
+        if (aLocale.Language.startsWith( "x-") || (aLocale.Language == "*"))
+        {
+            aLocale.Variant = aLocale.Language;
+            aLocale.Language = "qlt";
+        }
     }
     return aLocale;
 }

include/i18nlangtag/mslangid.hxx

@@ -242,14 +242,7 @@ public:
         I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocale(
                 LanguageType nLang, bool bResolveSystem );
 
-        /** Convert a LanguageType to a Locale, resolving LANGUAGE_SYSTEM.
-
-            Used by convertLanguageToLocale(LanguageType,bool)
-          */
-        I18NLANGTAG_DLLPRIVATE static void convertLanguageToLocale(
-                LanguageType nLang, ::com::sun::star::lang::Locale & rLocale );
-
-        /** Used by convertLanguageToLocale(LanguageType,Locale) */
+        /** Used by convertLanguageToLocale(LanguageType,bool) */
         I18NLANGTAG_DLLPRIVATE static void convertLanguageToIsoNames(
                 LanguageType nLang, OUString& rLangStr, OUString& rCountry );