cui/source/options/optgdlg.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit c30de064af34e288f3e224c1c7cf1923858eb738
Author: Eike Rathke <er...@redhat.com>
Date: Wed Dec 18 19:55:56 2013 +0100
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
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e2129cd..9904688 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
