AllSettings with LanguageTag

Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d

3 files changed, 7 insertions, 7 deletions

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 6b5603c127e9..c35464fa9d10 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -236,7 +236,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
     mpCharClass = new CharClass( *mpLocale );
 
     // If the current application language is a language that uses right-to-left text...
-    LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguage();
+    LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
     if( MsLangId::isRightToLeft( eRealCTLLanguage ) )
     {
         // ... then we have to set this as a default
@@ -271,7 +271,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
         OSL_FAIL("Can't get SpellChecker");
     }
 
-    rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguage() );
+    rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
 
     if (mpDocSh)
     {
@@ -325,7 +325,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
         OSL_FAIL("Can't get SpellChecker");
     }
 
-    pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
+    pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
 
     sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord();
     nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 354262187df5..8cbc2e82c962 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -922,8 +922,8 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId
 
     if( bChanged )
     {
-        GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguage() );
-        pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
+        GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
+        pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
         pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) );
         SetChanged( bChanged );
     }
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index ad1cde5dd369..5429938aa075 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1389,7 +1389,7 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC
     //  If the UI language is Korean, the default Latin font has to
     //  be queried for Korean, too (the Latin language from the document can't be Korean).
     //  This is the same logic as in SwDocShell::InitNew.
-    LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
+    LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType();
     if (MsLangId::isKorean(eUiLanguage))
         eLatin = eUiLanguage;
 
@@ -1401,7 +1401,7 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC
 /* converts the given western font height to a corresponding ctl font height, deppending on the system language */
 sal_uInt32 SdDrawDocument::convertFontHeightToCTL( sal_uInt32 nWesternFontHeight )
 {
-    LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguage();
+    LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
     if( LANGUAGE_THAI == eRealCTLLanguage )
     {
         // http://specs.openoffice.org/g11n/font_sizes/42775_42725_Individual_configurable_font_size_for_default_fonts.odt