[Libreoffice-commits] core.git: sfx2/source svl/source

[Eike Rathke]

 sfx2/source/doc/SfxDocumentMetaData.cxx |    2 +-
 sfx2/source/doc/doctemplates.cxx        |    2 +-
 svl/source/numbers/numfmuno.cxx         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e899f049edd46c49c2d4265c24b1ee4c82020406
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Oct 17 22:29:01 2016 +0200

    let LanguageTag::convertToLocale() decide when to create a temporary
    
    Change-Id: Id4e718eb23d4acf2ee7bddc4da1cd4e8e811be78

diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index cc2ecc6..859e264 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1499,7 +1499,7 @@ css::lang::Locale SAL_CALL
         SfxDocumentMetaData::getLanguage() throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
-    css::lang::Locale loc( LanguageTag( getMetaText("dc:language")).getLocale( false));
+    css::lang::Locale loc( LanguageTag::convertToLocale( getMetaText("dc:language"), false));
     return loc;
 }
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 903d6a7..8d6654b 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -475,7 +475,7 @@ void SfxDocTplService_Impl::getDefaultLocale()
         ::osl::MutexGuard aGuard( maMutex );
         if ( !mbLocaleSet )
         {
-            maLocale = LanguageTag( utl::ConfigManager::getLocale()).getLocale( false);
+            maLocale = LanguageTag::convertToLocale( utl::ConfigManager::getLocale(), false);
             mbLocaleSet = true;
         }
     }
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index cd78804..1721060 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -713,7 +713,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
         }
         else if (aPropertyName == PROPERTYNAME_LOCALE)
         {
-            lang::Locale aLocale( LanguageTag( pFormat->GetLanguage()).getLocale( false));
+            lang::Locale aLocale( LanguageTag::convertToLocale( pFormat->GetLanguage(), false));
             aRet <<= aLocale;
         }
         else if (aPropertyName == PROPERTYNAME_TYPE)