ResMgr with LanguageTag

Change-Id: Ie5ce9157a7ea59db7b0509fbaec61d07f8f9edf0

5 files changed, 8 insertions, 11 deletions

diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 76d867634838..dd4aae281288 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -91,7 +91,7 @@ void ODocumentInfoPreview::fill(
         }
         else
         {
-            insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, m_aLocale));
+            insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, LanguageTag(m_aLocale)));
         }
     }
 
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 4f81901dd511..c85de6f330f0 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -210,7 +210,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
 
             ResMgr*     pResMgr;
 
-            pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag().getLocale() );
+            pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() );
             aFltCallDlgPara.pResMgr = pResMgr;
 
             aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index c8e98e20088d..e7435569d400 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -280,7 +280,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
         rtl::OString aResMgrName(rtl::OUStringToOString(
             rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US));
 
-        ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag().getLocale() );
+        ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() );
 
         if( pResMgr )
         {
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 89d43c2fa916..c94ea3a2cce6 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -151,8 +151,7 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l
     RegisterDisplay(&aWndFunc);
     if( ! pMgr )
     {
-        com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
-        pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", aLocale );
+        pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() );
     }
 }
 
@@ -278,8 +277,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const
 
 {
     sal_Bool bRet = sal_False;
-    com::sun::star::lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale() );
-    ResMgr* pResMgr = ResMgr::CreateResMgr("ofa", aLocale );
+    ResMgr* pResMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() );
     if( pResMgr )
     {
         ResId aId(RID_ERRHDL, *pResMgr );
@@ -407,8 +405,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
     ResMgr* pFreeMgr = NULL;
     if( ! pMgr )
     {
-        com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
-        pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", aLocale );
+        pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() );
     }
     if( pMgr )
     {
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index 33ca09fe1095..5efc4474a4e6 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -25,7 +25,7 @@ static ResMgr* pMgr=NULL;
 
 namespace
 {
-    ResMgr* getResMgr(const ::com::sun::star::lang::Locale aLocale)
+    ResMgr* getResMgr(const LanguageTag& aLocale)
     {
         if (!pMgr)
             pMgr = ResMgr::CreateResMgr("svt", aLocale );
@@ -34,7 +34,7 @@ namespace
 
     ResMgr* getResMgr()
     {
-        return getResMgr(Application::GetSettings().GetUILanguageTag().getLocale());
+        return getResMgr(Application::GetSettings().GetUILanguageTag());
     }
 }