AllSettings with LanguageTag

Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d

7 files changed, 9 insertions, 8 deletions

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index b6e1c3b7dc5f..ce7cbb77696b 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
 	editeng \
 	fwe \
 	sal \
+	i18nisolang1 \
 	sb \
 	sfx \
 	sot \
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index afc4558e07b8..86738b6efbb6 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -484,7 +484,7 @@ Locale AccessibleDialogControlShape::getLocale(  ) throw (IllegalAccessibleCompo
 {
     OExternalLockGuard aGuard( this );
 
-    return Application::GetSettings().GetLocale();
+    return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index d360799be8b9..0e4dd99a4f18 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -801,7 +801,7 @@ Locale AccessibleDialogWindow::getLocale(  ) throw (IllegalAccessibleComponentSt
 {
     OExternalLockGuard aGuard( this );
 
-    return Application::GetSettings().GetLocale();
+    return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index db2888c0f74c..c95ac09bbf5f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -279,7 +279,7 @@ String EditorWindow::GetWordAtCursor()
             const TextPaM& rSelStart = rSelection.GetStart();
             const TextPaM& rSelEnd = rSelection.GetEnd();
             String aText = pTextEngine->GetText( rSelEnd.GetPara() );
-            CharClass aClass( ::comphelper::getProcessComponentContext() , Application::GetSettings().GetLocale() );
+            CharClass aClass( ::comphelper::getProcessComponentContext() , Application::GetSettings().GetLanguageTag().getLocale() );
             xub_StrLen nSelStart = static_cast< xub_StrLen >( rSelStart.GetIndex() );
             xub_StrLen nSelEnd = static_cast< xub_StrLen >( rSelEnd.GetIndex() );
             xub_StrLen nLength = static_cast< xub_StrLen >( aText.Len() );
@@ -826,7 +826,7 @@ void EditorWindow::ImplSetFont()
         get_value_or( OUString() ) );
     if ( sFontName.isEmpty() )
     {
-        Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguage(), 0 , this ) );
+        Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
         sFontName = aTmpFont.GetName();
     }
     Size aFontSize(0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get());
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 959fa8c70717..4d4e0bc9591e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1065,7 +1065,7 @@ bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocum
             }
 
             // Resource?
-            ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
+            ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
             Reference< task::XInteractionHandler > xDummyHandler;
             bool bReadOnly = true;
             Reference< XStringResourceWithLocation > xImportStringResource =
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index c0669e8b5989..966a6ece6a30 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -126,7 +126,7 @@ Dll::Dll () :
     (void)pFact;
 
     ResMgr* pMgr = ResMgr::CreateResMgr(
-        "basctl", Application::GetSettings().GetUILocale()
+        "basctl", Application::GetSettings().GetUILanguageTag().getLocale()
     );
 
     Module::Get() = new Module( pMgr, &DocShell::Factory() );
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 61b41eb21ad7..b58b3266b178 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -61,7 +61,7 @@ namespace {
         long nWidth = 0;
         Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() );
         sal_Int32 nStartPos = 0;
-        const Locale aLocale = Application::GetSettings().GetUILocale();
+        const Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
         Boundary aBoundary = xBreakIter->getWordBoundary(
             rText, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES, true );
 
@@ -341,7 +341,7 @@ void SetDefaultLanguageDialog::FillLanguageBox()
     }
     else
         // preselect current UI language
-        m_pLanguageLB->SelectLanguage( Application::GetSettings().GetUILanguage() );
+        m_pLanguageLB->SelectLanguage( Application::GetSettings().GetUILanguageTag().getLanguageType() );
 }
 
 void SetDefaultLanguageDialog::CalcInfoSize()