AllSettings with LanguageTag

Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d

14 files changed, 21 insertions, 21 deletions

diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 80745859addf..048b0d834618 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -155,7 +155,7 @@ void ODocumentInfoPreview::insertDateTime(
         Time(
             value.Hours, value.Minutes, value.Seconds, value.HundredthSeconds));
     if (aToolsDT.IsValidAndGregorian()) {
-        LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() );
+        LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() );
         rtl::OUStringBuffer buf(aLocaleWrapper.getDate(aToolsDT));
         buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
         buf.append(aLocaleWrapper.getTime(aToolsDT));
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 35caa93a76d7..1f02aff742a3 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1710,7 +1710,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
     ,mbReplaceNames             ( sal_False )
     ,mnSuspendSelectCallback    ( 0 )
     ,mbIsFirstResort            ( sal_True )
-    ,aIntlWrapper               ( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() )
+    ,aIntlWrapper               ( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() )
     ,maFolderImage              ( SvtResId( IMG_SVT_FOLDER ) )
     ,mxCmdEnv ( xEnv )
 
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 5fb56b0c6e83..a81ec7602802 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -125,7 +125,7 @@ SvImpLBox::~SvImpLBox()
 
 void SvImpLBox::UpdateStringSorter()
 {
-    const ::com::sun::star::lang::Locale& rNewLocale = Application::GetSettings().GetLocale();
+    const ::com::sun::star::lang::Locale& rNewLocale = Application::GetSettings().GetLanguageTag().getLocale();
 
     if( m_pStringSorter )
     {
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index cebc2feaca6b..4a2c156e2d91 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1460,7 +1460,7 @@ void FontStyleBox::LoseFocus()
 void FontStyleBox::Modify()
 {
     CharClass   aChrCls( ::comphelper::getProcessComponentContext(),
-                        GetSettings().GetLocale() );
+                        GetSettings().GetLanguageTag().getLocale() );
     XubString   aStr = GetText();
     sal_uInt16      nEntryCount = GetEntryCount();
 
@@ -1682,7 +1682,7 @@ void FontSizeBox::ImplInit()
 
 void FontSizeBox::Reformat()
 {
-    FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() );
+    FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
     if ( !bRelativeMode || !aFontSizeNames.IsEmpty() )
     {
         long nNewValue = aFontSizeNames.Name2Size( GetText() );
@@ -1776,7 +1776,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
     }
 
     // first insert font size names (for simplified/traditional chinese)
-    FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() );
+    FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
     if ( pAry == pList->GetStdSizeAry() )
     {
         // for standard sizes we don't need to bother
@@ -1943,7 +1943,7 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
     if ( !bRelative )
     {
         sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() );
-        FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() );
+        FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
         // conversion loses precision; however font sizes should
         // never have a problem with that
         String aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) );
@@ -1971,7 +1971,7 @@ sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
 {
     if ( !bRelative )
     {
-        FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() );
+        FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
         sal_Int64 nValue = aFontSizeNames.Name2Size( GetText() );
         if ( nValue)
             return MetricField::ConvertValue( nValue, GetBaseValue(), GetDecimalDigits(), GetUnit(), eOutUnit );
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 918920c066cf..5861b23d05da 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -779,7 +779,7 @@ static const ImplFSNameItem aImplSimplifiedChinese[] =
 FontSizeNames::FontSizeNames( LanguageType eLanguage )
 {
     if ( eLanguage == LANGUAGE_DONTKNOW )
-        eLanguage = Application::GetSettings().GetUILanguage();
+        eLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType();
     if ( eLanguage == LANGUAGE_SYSTEM )
         eLanguage = MsLangId::getSystemUILanguage();
 
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 71a98a403eee..ab684460f512 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -176,7 +176,7 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
     sal_uInt16 nPos = 0;
 
     // first insert font size names (for simplified/traditional chinese)
-    FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguage() );
+    FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() );
     mpHeightAry = new long[nSizeCount+aFontSizeNames.Count()];
     if ( !aFontSizeNames.IsEmpty() )
     {
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index b7889c58baa1..2efa5a96d93f 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -330,7 +330,7 @@ bool LetterTable::isLetterUnicode( sal_Unicode c )
 {
     static CharClass* pCharClass = NULL;
     if( pCharClass == NULL )
-        pCharClass = new CharClass( Application::GetSettings().GetLocale() );
+        pCharClass = new CharClass( Application::GetSettings().GetLanguageTag().getLocale() );
     rtl::OUString aStr( c );
     bool bRet = pCharClass->isLetter( aStr, 0 );
     return bRet;
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index d5cad36e0f22..320354bcf74a 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().GetUILocale() );
+            pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag().getLocale() );
             aFltCallDlgPara.pResMgr = pResMgr;
 
             aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 4db83cce97b9..4d7aeff86569 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -847,7 +847,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
 {
     Graphic     aGraphic;
 
-    ResMgr*     pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILocale() );
+    ResMgr*     pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag().getLocale() );
 
     sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ), 0 );
     sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ), 0 );
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index cb328464f284..f49ebb620073 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().GetUILocale() );
+        ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag().getLocale() );
 
         if( pResMgr )
         {
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index ea42a5ef41c3..89d43c2fa916 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -151,7 +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().GetUILocale();
+        com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
         pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", aLocale );
     }
 }
@@ -278,7 +278,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const
 
 {
     sal_Bool bRet = sal_False;
-    com::sun::star::lang::Locale aLocale( Application::GetSettings().GetUILocale() );
+    com::sun::star::lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale() );
     ResMgr* pResMgr = ResMgr::CreateResMgr("ofa", aLocale );
     if( pResMgr )
     {
@@ -407,7 +407,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
     ResMgr* pFreeMgr = NULL;
     if( ! pMgr )
     {
-        com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
+        com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
         pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", aLocale );
     }
     if( pMgr )
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 88a8c785061f..e4168a8907b2 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -32,9 +32,9 @@
 
 void localizeWebserviceURI( ::rtl::OUString& rURI )
 {
-    ::rtl::OUString aLang = Application::GetSettings().GetUILocale().Language;
+    ::rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
     if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pt"))
-         && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("br")) )
+         && Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("br")) )
     {
         aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pt-br" ));
     }
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index 64efb02fe80f..33ca09fe1095 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -34,7 +34,7 @@ namespace
 
     ResMgr* getResMgr()
     {
-        return getResMgr(Application::GetSettings().GetUILocale());
+        return getResMgr(Application::GetSettings().GetUILanguageTag().getLocale());
     }
 }
 
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 6f3b57395a12..14d62066d3f1 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -954,7 +954,7 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum(
             append(OOO_STRING_SVTOOLS_HTML_O_SDnum).
             append(RTL_CONSTASCII_STRINGPARAM("=\"")).
             append(static_cast<sal_Int32>(
-                Application::GetSettings().GetLanguage())).
+                Application::GetSettings().GetLanguageTag().getLanguageType())).
             append(';'); // Language fuer Format 0
         if ( nFormat )
         {