diff options
| author | Eike Rathke <erack@redhat.com> | 2013-12-18 19:55:56 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-12-18 20:16:08 +0100 |
| commit | 57bf54e1691691c606cd04baa60b677b9376c2ae (patch) | |
| tree | c3959cbcab3e49eebea79d20441a12cf9bb1edd9 | |
| parent | cdd695b5048455a611fb44fbc60ef1844ae60fe1 (diff) | |
do not resolve the "Default ..." locale entry, it means SYSTEM
Once selected, the locale was resolved and the "Default ..." entry never
displayed again.
Change-Id: I4d94730b1c104e0b96e7e02275958b78e2899eca
(cherry picked from commit c30de064af34e288f3e224c1c7cf1923858eb738)
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e2129cdcae33..9904688772a7 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1250,6 +1250,13 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) LanguageType eOldLocale = (!sLang.isEmpty() ? LanguageTag::convertToLanguageTypeWithFallback( sLang ) : LANGUAGE_SYSTEM); LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage(); + + // If the "Default ..." entry was selected that means SYSTEM, the actual + // eNewLocale value is temporary for the dialog only, do not resolve to + // what system currently is. + if (eNewLocale == LANGUAGE_USER_SYSTEM_CONFIG) + eNewLocale = LANGUAGE_SYSTEM; + if ( eOldLocale != eNewLocale ) { // an empty string denotes SYSTEM locale |