diff options
| author | Rob Snelders <programming@ertai.nl> | 2012-07-08 20:51:13 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-07-09 12:25:58 +0200 |
| commit | 02b435f235d2863ee344054262200152edbba3a3 (patch) | |
| tree | fb3ca6d1ad183f74f00ecdd47f92f97c63ec3059 /cui | |
| parent | 43d7d0684af0df1d5bde69d361365e786bf249bf (diff) | |
- fdo#45830 - Language/User Interface: current choice indicated as default
Change-Id: I3ac2e8e3219c12be84ce38cb98342f0dce0d6476
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6317c83e9699..06e232915c95 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1355,7 +1355,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX ); aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_False, sal_False, sal_False); - aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK ); + aLocaleSettingLB.InsertSystemLanguage( ); const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable(); const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM ); @@ -1697,7 +1697,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) if ( !sLang.isEmpty() ) aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang)); else - aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM ); + aLocaleSettingLB.SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); aLocaleSettingLB.Enable(!bReadonly); aLocaleSettingFT.Enable(!bReadonly); @@ -1904,7 +1904,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) } sal_uInt16 nPos; - if ( eLang == LANGUAGE_SYSTEM ) + if ( eLang == LANGUAGE_USER_SYSTEM_CONFIG ) nPos = aCurrencyLB.GetEntryPos( (void*) NULL ); else { |