summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-12-18 19:55:56 +0100
committerEike Rathke <erack@redhat.com>2013-12-18 20:15:11 +0100
commitc30de064af34e288f3e224c1c7cf1923858eb738 (patch)
tree931c5665cc27475d08c456e0e15830c8611c0a0a /cui
parentd0f8b0262707529f36a7317663df1b1035d0c62a (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
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optgdlg.cxx7
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