diff options
Diffstat (limited to 'editeng/source/editeng')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/eerdll.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 4 |
3 files changed, 6 insertions, 6 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 ); } |