From 8c736b8543ca3d36612270cb4ceb2ae0a7abe2e7 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 9 Dec 2011 22:33:50 +0100 Subject: fixed fdo#37349 present Catalan (Valencian) as selectable UI language Catalan (Valencian) has no ISO 639 code assigned and the UI localization uses the ca-XV hack where XV is of the reserved ISO 3166 user-assigned range. This should not escape to document content therefor internally a replacement to ca-ES is done for all locale attribution. For the UI localization to be distinguishable under Tools->Options->LanguageSettings->UserInterface this needed a special handling to allow Catalan (Valencian) again. --- i18npool/source/isolang/mslangid.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'i18npool/source') diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 06941b62d10a..e5661dab2d9d 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -379,7 +379,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang ) // static -LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang ) +LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, bool bUserInterfaceSelection ) { switch (nLang) { @@ -433,7 +433,8 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang ) // Do not use ca-XV for document content. /* TODO: remove in case we implement BCP47 language tags. */ case LANGUAGE_USER_CATALAN_VALENCIAN: - nLang = LANGUAGE_CATALAN; + if (!bUserInterfaceSelection) + nLang = LANGUAGE_CATALAN; break; } return nLang; -- cgit