summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-07-12 21:14:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-07-13 10:25:32 +0100
commit398d59dd901f8b722173a9c2872181b441ff6bdf (patch)
tree2eda81c687e2dcc8f654552ab746434bfad95f1b
parentf61a73058783928ba1814ad142f64eed3d004a94 (diff)
callcatcher: remove beautiful, but unused methods
-rw-r--r--i18npool/inc/i18npool/mslangid.hxx34
-rw-r--r--i18npool/source/isolang/mslangid.cxx31
2 files changed, 1 insertions, 64 deletions
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 6e8384b2ad..15fcd01777 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -75,9 +75,7 @@ public:
special value.
@descr: NOTE: The "system" values may be overridden by the
- application's configuration. If you need to access the system
- values use <method>getRealLanguageWithoutConfig()</method>
- instead.
+ application's configuration.
@returns
case LANGUAGE_PROCESS_OR_USER_DEFAULT : configured or system language
@@ -154,13 +152,6 @@ public:
static ::com::sun::star::lang::Locale getFallbackLocale(
const ::com::sun::star::lang::Locale & rLocale );
-
- /** Get fall-back LanguageType for LanguageType, resolving LANGUAGE_SYSTEM.
- Returns the same LanguageType if an exact match was found.
- */
- static LanguageType getFallbackLanguage( LanguageType nLang );
-
-
// -----------------------------
// - ConvertLanguageToIsoNames -
// -----------------------------
@@ -187,29 +178,6 @@ public:
static LanguageType convertUnxByteStringToLanguage(
const rtl::OString& rString );
-
- /** @short: A real language/locale if the nLang parameter designates some
- special value.
-
- @descr: NOTE: This is a raw interface to the system and does not take
- any application configuration into account. If that is wanted,
- which is most likely, use <method>getRealLanguage()</method>
- instead.
-
- @returns
- case LANGUAGE_PROCESS_OR_USER_DEFAULT : getSystemLanguage()
- case LANGUAGE_SYSTEM_DEFAULT : getSystemLanguage()
- case LANGUAGE_SYSTEM : getSystemLanguage()
- case LANGUAGE_NONE : getSystemUILanguage()
- case LANGUAGE_DONTKNOW : LANGUAGE_ENGLISH_US
- else: nLang
-
- In case getSystemLanguage() or getSystemUILanguage() returned
- LANGUAGE_DONTKNOW, LANGUAGE_ENGLISH_US is returned instead.
- */
- static LanguageType getRealLanguageWithoutConfig( LanguageType nLang );
-
-
static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType );
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index aa1397c383..74838ba4d4 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 )
{