diff options
| author | Eike Rathke <erack@redhat.com> | 2013-07-10 21:07:01 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-07-10 21:07:21 +0200 |
| commit | f8e34b5c1281b32ad28087e458cd926b15955527 (patch) | |
| tree | fd693ae967413550664285879be04e878bc5e338 /cui | |
| parent | 3bc422573b480476bdfa775bdcf259532f4e09c6 (diff) | |
use LanguageTag to convert
Change-Id: I2e35ac3d905fc4837dbc68fe6c97ed4891a85400
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index a0f628469701..6e0cb4701597 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1148,22 +1148,6 @@ SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAtt return new OfaLanguagesTabPage(pParent, rAttrSet); } -static LanguageType lcl_LangStringToLangType(const OUString& rLang) -{ - Locale aLocale; - sal_Int32 nSep = rLang.indexOf('-'); - if (nSep < 0) - aLocale.Language = rLang; - else - { - aLocale.Language = rLang.copy(0, nSep); - if (nSep < rLang.getLength()) - aLocale.Country = rLang.copy(nSep+1, rLang.getLength() - (nSep+1)); - } - LanguageType eLangType = LanguageTag( aLocale ).getLanguageType(); - return eLangType; -} - static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) { SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); @@ -1261,7 +1245,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); LanguageType eOldLocale = (!sLang.isEmpty() ? - lcl_LangStringToLangType( sLang ) : LANGUAGE_SYSTEM); + LanguageTag( sLang ).getLanguageType() : LANGUAGE_SYSTEM); LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage(); if ( eOldLocale != eNewLocale ) { @@ -1423,7 +1407,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); if ( !sLang.isEmpty() ) - m_pLocaleSettingLB->SelectLanguage(lcl_LangStringToLangType(sLang)); + m_pLocaleSettingLB->SelectLanguage(LanguageTag(sLang).getLanguageType()); else m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); |