[Libreoffice-commits] core.git: 2 commits - comphelper/source configmgr/source

[Eike Rathke]

 comphelper/source/misc/configuration.cxx   |    2 +-
 configmgr/source/configurationprovider.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26fc9be1bf2d6aaeb52a571ea416f4527a52e146
Author: Eike Rathke <erack at redhat.com>
Date:   Sun Jan 19 15:02:07 2014 +0100

    do not resolve empty locale here when set, fdo#73549 related
    
    Change-Id: Id9c8c3926f64826fd2295e0f75f007ce435f5915

diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 637657b..8a76390 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -344,7 +344,7 @@ void Service::setLocale(css::lang::Locale const & eLocale)
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard guard(*lock_);
-    locale_ = LanguageTag::convertToBcp47( eLocale);
+    locale_ = LanguageTag::convertToBcp47( eLocale, false);
 }
 
 css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
commit db6f8f9f8969b592ed90c841960fdd186e1cbc5a
Author: Eike Rathke <erack at redhat.com>
Date:   Sun Jan 19 14:02:44 2014 +0100

    fdo#73549 do not resolve empty locale here if not determined yet
    
    Change-Id: Iad03d6209a2b4024b27c6195195e5aa557c295fe

diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 69885b9..6f9e5fd 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -47,7 +47,7 @@ OUString getDefaultLocale(
         css::uno::Reference< css::lang::XLocalizable >(
             css::configuration::theDefaultProvider::get(context),
             css::uno::UNO_QUERY_THROW)->
-        getLocale()).getBcp47();
+        getLocale()).getBcp47(false);
 }
 
 OUString extendLocalizedPath(OUString const & path, OUString const & locale) {