[Libreoffice-commits] core.git: unotools/source

[Eike Rathke]

 unotools/source/config/syslocaleoptions.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ecefa40c081a0b6677e946603d553d9382f9b9ca
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Sep 26 22:58:34 2013 +0200

    use makeFallback() in MakeRalLocale()/MakeRealUILocale()
    
    The old MsLangId::convert...() methods did implicitly fall back to a
    known locale, this behavior is explicitly needed here to select a proper
    completely known locale.
    
    Change-Id: I350989f3af679890ddb0de964c2d107420331160

diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 7e13611..f266b4d 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -266,11 +266,11 @@ void SvtSysLocaleOptions_Impl::MakeRealLocale()
     if (m_aLocaleString.isEmpty())
     {
         LanguageType nLang = MsLangId::getSystemLanguage();
-        m_aRealLocale.reset( nLang);
+        m_aRealLocale.reset( nLang).makeFallback();
     }
     else
     {
-        m_aRealLocale.reset( m_aLocaleString);
+        m_aRealLocale.reset( m_aLocaleString).makeFallback();
     }
 }
 
@@ -279,11 +279,11 @@ void SvtSysLocaleOptions_Impl::MakeRealUILocale()
     if (m_aUILocaleString.isEmpty())
     {
         LanguageType nLang = MsLangId::getSystemUILanguage();
-        m_aRealUILocale.reset( nLang);
+        m_aRealUILocale.reset( nLang).makeFallback();
     }
     else
     {
-        m_aRealUILocale.reset( m_aUILocaleString);
+        m_aRealUILocale.reset( m_aUILocaleString).makeFallback();
     }
 }