diff options
| author | Eike Rathke <erack@redhat.com> | 2014-08-04 14:05:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-08-04 14:24:17 +0200 |
| commit | 4189b715999bf9ebb0cd04a0c610a7b514e28d1b (patch) | |
| tree | fbdaa057a52553df749e3a260312bf530a5f84fc /cui | |
| parent | 955c5539a1ea5e971f111989d6c5bec11d936416 (diff) | |
suppress legacy locales, fdo#44112 related
With MsLangId::isLegacy() locales can be suppressed in language lists
and are not offered unless actually used at the current position of the
document. Language attribution now handles adding a language/locale to
the list on the fly.
For example, Serbian (Latin or Cyrillic) for "Serbia and Montenegro" are
legacy locales, the confederation doesn't exist anymore. A further
candidate would be pap-AN as the Netherlands Antilles ceased to exist,
see fdo#44112.
Suppressing "Serbian Cyrillic (Serbia and Montenegro)" also has the nice
benefit of narrowing the language list box width a little ...
Change-Id: Id05cce328622465016901524b759369c18bc4dbd
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/numfmt.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 452866736904..de36480db1c8 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -25,6 +25,7 @@ #include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> #include <i18nlangtag/lang.h> +#include <i18nlangtag/mslangid.hxx> #include <svx/dialogs.hrc> #include <svtools/colorcfg.hxx> @@ -319,6 +320,8 @@ void SvxNumberFormatTabPage::Init_Impl() // initialize language ListBox m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); + /* TODO: any reason we're doing a manual init here instead of using + * SvxLanguageBoxBase::SetLanguageList( LANG_LIST_ONLY_KNOWN, ...)? */ // Don't list ambiguous locales where we won't be able to convert the // LanguageType back to an identical Language_Country name and therefore // couldn't load the i18n LocaleData. Show DebugMsg in non-PRODUCT version. @@ -327,7 +330,8 @@ void SvxNumberFormatTabPage::Init_Impl() sal_Int32 nCount = xLang.getLength(); for ( sal_Int32 i=0; i<nCount; i++ ) { - m_pLbLanguage->InsertLanguage( xLang[i] ); + if (!MsLangId::isLegacy( xLang[i])) + m_pLbLanguage->InsertLanguage( xLang[i] ); } } |