summaryrefslogtreecommitdiff
path: root/svtools/source/misc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2011-12-09 22:33:50 +0100
committerEike Rathke <erack@redhat.com>2011-12-09 22:37:03 +0100
commiteea858f6c7696becab4e67ca00f5ee0293e63718 (patch)
tree28abc81d04c93ff7ee2939dc670c9c565e086100 /svtools/source/misc
parent656b578086f88f262002869c3632fdbd95a66784 (diff)
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.
Diffstat (limited to 'svtools/source/misc')
-rw-r--r--svtools/source/misc/langtab.cxx4
-rw-r--r--svtools/source/misc/langtab.src1
2 files changed, 3 insertions, 2 deletions
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 2ce718e54d2b..51e93d485065 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -136,9 +136,9 @@ SvtLanguageTable::~SvtLanguageTable()
//------------------------------------------------------------------------
-const String& SvtLanguageTable::GetString( const LanguageType eType ) const
+const String& SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
{
- LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType);
+ LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection);
sal_uInt32 nPos = FindIndex( eLang );
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 5d743e30f16c..b82e0f467763 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -79,6 +79,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Bulgarian" ; LANGUAGE_BULGARIAN ; > ;
< "Belarusian" ; LANGUAGE_BELARUSIAN ; > ;
< "Catalan" ; LANGUAGE_CATALAN ; > ;
+ < "Catalan (Valencian)" ; LANGUAGE_USER_CATALAN_VALENCIAN ; > ; // UI only!
< "Chinese (traditional)" ; LANGUAGE_CHINESE_TRADITIONAL ; > ;
< "Chinese (simplified)" ; LANGUAGE_CHINESE_SIMPLIFIED ; > ;
< "Chinese (Hong Kong)" ; LANGUAGE_CHINESE_HONGKONG ; > ;