3 files changed, 4 insertions, 51 deletions
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index a96f80719357..0a1d524d2cda 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -1012,26 +1012,6 @@ LanguageType MsLangId::convertIsoStringToLanguage(
 
 // -----------------------------------------------------------------------
 
-// static
-LanguageType MsLangId::convertIsoByteStringToLanguage(
-        const rtl::OString& rString, sal_Char cSep )
-{
-    rtl::OString  aLang;
-    rtl::OString  aCountry;
-    sal_Int32  nSepPos = rString.indexOf( cSep );
-    if ( nSepPos >= 0 )
-    {
-        aLang = rString.copy( 0, nSepPos );
-        aCountry = rString.copy( nSepPos+1 );
-    }
-    else
-        aLang = rString;
-
-    return convertIsoNamesToLanguage( aLang, aCountry );
-}
-
-// -----------------------------------------------------------------------
-
 struct IsoLangGLIBCModifiersEntry
 {
     LanguageType  mnLang;
diff --git a/i18npool/source/isolang/makefile.mk b/i18npool/source/isolang/makefile.mk
index b8f01460f67b..2ade308aa91c 100644
--- a/i18npool/source/isolang/makefile.mk
+++ b/i18npool/source/isolang/makefile.mk
@@ -43,7 +43,11 @@ SLOFILES=	$(SLO)$/insys.obj  \
             $(SLO)$/mslangid.obj
 
 SHL1TARGET=		$(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=		i$(ISOLANG_TARGET)
+.ELSE
+SHL1IMPLIB=		$(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.ENDIF
 
 DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index c11d4d6d1387..2b5c59e865a7 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -90,29 +90,6 @@ inline LanguageType MsLangId::simplifySystemLanguages( LanguageType nLang )
     return nLang;
 }
 
-
-// static
-LanguageType MsLangId::getRealLanguageWithoutConfig( LanguageType nLang )
-{
-    switch (simplifySystemLanguages( nLang))
-    {
-        case LANGUAGE_SYSTEM :
-            nLang = getSystemLanguage();
-            break;
-        case LANGUAGE_NONE :
-            nLang = getSystemUILanguage();
-            break;
-        default:
-            /* TODO: would this be useful here? */
-            //nLang = MsLangId::getReplacementForObsoleteLanguage( nLang);
-            ;   // nothing
-    }
-    if (nLang == LANGUAGE_DONTKNOW)
-        nLang = LANGUAGE_ENGLISH_US;
-    return nLang;
-}
-
-
 // static
 LanguageType MsLangId::getRealLanguage( LanguageType nLang )
 {
@@ -252,14 +229,6 @@ LanguageType MsLangId::convertLocaleToLanguageWithFallback(
     return lookupFallbackLocale( rLocale);
 }
 
-
-// static
-LanguageType MsLangId::getFallbackLanguage( LanguageType nLang )
-{
-    return lookupFallbackLanguage( MsLangId::getRealLanguage( nLang));
-}
-
-
 // static
 bool MsLangId::isRightToLeft( LanguageType nLang )
 {