AllSettings with LanguageTag

Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d

5 files changed, 8 insertions, 7 deletions

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index af0e885146ee..e9978d606475 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,sm,\
         cppuhelper \
         editeng \
         i18nutil \
+		i18nisolang1 \
         msfilter \
         oox \
         sal \
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 508208c27e81..1140f6003d1f 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -400,7 +400,7 @@ Locale SAL_CALL SmGraphicAccessible::getLocale()
     SolarMutexGuard aGuard;
     // should be the document language...
     // We use the language of the localized symbol names here.
-    return Application::GetSettings().GetUILocale();
+    return Application::GetSettings().GetUILanguageTag().getLocale();
 }
 
 
@@ -1918,7 +1918,7 @@ Locale SAL_CALL SmEditAccessible::getLocale(  )
     SolarMutexGuard aGuard;
     // should be the document language...
     // We use the language of the localized symbol names here.
-    return Application::GetSettings().GetUILocale();
+    return Application::GetSettings().GetUILanguageTag().getLocale();
 }
 
 
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 939dd2c93e75..56ba7bc77a8a 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -999,7 +999,7 @@ void SmMathConfig::LoadFormat()
             ++pVal;
         }
 
-        LanguageType nLang = Application::GetSettings().GetUILanguage();
+        LanguageType nLang = Application::GetSettings().GetUILanguageTag().getLanguageType();
         for (i = FNT_BEGIN;  i < FNT_END;  ++i)
         {
             Font aFnt;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index f783c710e259..e8aecc11a07a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2423,7 +2423,7 @@ SmParser::SmParser()
 {
     m_eConversion = CONVERT_NONE;
     bImportSymNames = m_bExportSymNames = false;
-    m_nLang = Application::GetSettings().GetUILanguage();
+    m_nLang = Application::GetSettings().GetUILanguageTag().getLanguageType();
 }
 
 SmNode *SmParser::Parse(const String &rBuffer)
@@ -2444,7 +2444,7 @@ SmNode *SmParser::Parse(const String &rBuffer)
     while ( !m_aNodeStack.empty() )
         m_aNodeStack.pop();
 
-    SetLanguage( Application::GetSettings().GetUILanguage() );
+    SetLanguage( Application::GetSettings().GetUILanguageTag().getLanguageType() );
     NextToken();
     Table();
 
@@ -2468,7 +2468,7 @@ SmNode *SmParser::ParseExpression(const OUString &rBuffer)
     while ( !m_aNodeStack.empty() )
         m_aNodeStack.pop();
 
-    SetLanguage( Application::GetSettings().GetUILanguage() );
+    SetLanguage( Application::GetSettings().GetUILanguageTag().getLanguageType() );
     NextToken();
     Expression();
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index efa322573de9..9e9228888918 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -953,7 +953,7 @@ sal_Int32 SAL_CALL SmModel::getRendererCount(
 static Size lcl_GuessPaperSize()
 {
     Size aRes;
-    LocaleDataWrapper aLocWrp( AllSettings().GetLocale() );
+    LocaleDataWrapper aLocWrp( AllSettings().GetLanguageTag().getLocale() );
     if( MEASURE_METRIC == aLocWrp.getMeasurementSystemEnum() )
     {
         // in 100th mm