AllSettings with LanguageTag

Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d

6 files changed, 10 insertions, 14 deletions

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 86084a7a1de0..f4301c9840fc 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -91,7 +91,7 @@ static LanguageType lcl_CheckLanguage(
         lang::Locale aLocale( xLangGuess->guessPrimaryLanguage( rText, 0, rText.getLength()) );
 
         // get language as from "Tools/Options - Language Settings - Languages: Locale setting"
-        LanguageType nTmpLang = Application::GetSettings().GetLanguage();
+        LanguageType nTmpLang = Application::GetSettings().GetLanguageTag().getLanguageType();
 
         // if the result from language guessing does not provide a 'Country' part
         // try to get it by looking up the locale setting of the office.
@@ -123,9 +123,9 @@ static LanguageType lcl_CheckLanguage(
         // The default document language from "Tools/Options - Language Settings - Languages: Western"
         aLangList[0] = aLinguOpt.nDefaultLanguage;
         // The one from "Tools/Options - Language Settings - Languages: User interface"
-        aLangList[1] = rSettings.GetUILanguage();
+        aLangList[1] = rSettings.GetUILanguageTag().getLanguageType();
         // The one from "Tools/Options - Language Settings - Languages: Locale setting"
-        aLangList[2] = rSettings.GetLanguage();
+        aLangList[2] = rSettings.GetLanguageTag().getLanguageType();
         // en-US
         aLangList[3] = LANGUAGE_ENGLISH_US;
 #ifdef DEBUG
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 8836b4201019..740de3a76adb 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -211,7 +211,7 @@ EditResId::EditResId( sal_uInt16 nId ):
 EditDLL::EditDLL()
 {
     pGlobalData = new GlobalEditData;
-    pResMgr = ResMgr::CreateResMgr( "editeng", Application::GetSettings().GetUILocale() );
+    pResMgr = ResMgr::CreateResMgr( "editeng", Application::GetSettings().GetUILanguageTag().getLocale() );
 }
 
 EditDLL::~EditDLL()
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index b3217e70514c..b6c9f7fc4e44 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4246,7 +4246,7 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x
     else if ( SvtCTLOptions::NUMERALS_ARABIC == nCTLTextNumerals )
         eLang = LANGUAGE_ENGLISH;
     else if ( SvtCTLOptions::NUMERALS_SYSTEM == nCTLTextNumerals )
-        eLang = (LanguageType) Application::GetSettings().GetLanguage();
+        eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType();
 
     if(pOutDev)
     {
@@ -4337,7 +4337,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara,
     else if ( SvtCTLOptions::NUMERALS_ARABIC == pCTLOptions->GetCTLTextNumerals() )
         eLang = LANGUAGE_ENGLISH;
     else
-        eLang = (LanguageType) Application::GetSettings().GetLanguage();
+        eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType();
 
     pOutDev->SetDigitLanguage( eLang );
 }
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 6cf0953c5ed6..a8612478b19b 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -100,7 +100,7 @@ SvxNumberType::~SvxNumberType()
 
 String SvxNumberType::GetNumStr( sal_uLong nNo ) const
 {
-    LanguageType eLang = Application::GetSettings().GetLanguage();
+    LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
     Locale aLocale = SvxCreateLocale(eLang);
     return GetNumStr( nNo, aLocale );
 }
@@ -562,7 +562,7 @@ SvxNumRule::SvxNumRule( sal_uLong nFeatures,
       bContinuousNumbering(bCont)
 {
     ++nRefCount;
-    LanguageType eLang = Application::GetSettings().GetLanguage();
+    LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
     aLocale = SvxCreateLocale(eLang);
     for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d8ae94cc93d5..9bce44939317 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -198,7 +198,7 @@ static ::com::sun::star::uno::Reference<
 
 static sal_uInt16 GetAppLang()
 {
-    return Application::GetSettings().GetLanguage();
+    return Application::GetSettings().GetLanguageTag().getLanguageType();
 }
 static LocaleDataWrapper& GetLocaleDataWrapper( sal_uInt16 nLang )
 {
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 9d2a3172259f..baccbdeb87ea 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -45,11 +45,7 @@ using namespace ::com::sun::star;
 static CharSet lcl_GetDefaultTextEncodingForRTF()
 {
 
-    ::com::sun::star::lang::Locale aLocale;
-    ::rtl::OUString aLangString;
-
-    aLocale = Application::GetSettings().GetLocale();
-    aLangString = aLocale.Language;
+    ::rtl::OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage());
 
     if ( aLangString == "ru" || aLangString == "uk" )
         return RTL_TEXTENCODING_MS_1251;