Kaydet (Commit) d98e8a22 authored tarafından Eike Rathke's avatar Eike Rathke

AllSettings LanguageTag also in win-only files

Change-Id: I7a64a3d582d064608583a80d206745a77f474cfa
üst c6c3bf96
...@@ -419,7 +419,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar ) ...@@ -419,7 +419,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
// TODO: use the default-CJK language selected in // TODO: use the default-CJK language selected in
// Tools->Options->LangSettings->Languages when it becomes available here // Tools->Options->LangSettings->Languages when it becomes available here
if( !nDefaultLang ) if( !nDefaultLang )
nDefaultLang = Application::GetSettings().GetUILanguage(); nDefaultLang = Application::GetSettings().GetUILanguageTag().getLanguageType();
LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE; LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE;
...@@ -555,7 +555,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon ...@@ -555,7 +555,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
// fall back to default UI locale if the missing characters are inconclusive // fall back to default UI locale if the missing characters are inconclusive
if( eLang == LANGUAGE_DONTKNOW ) if( eLang == LANGUAGE_DONTKNOW )
aLocale = Application::GetSettings().GetUILocale(); aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
// first level fallback: // first level fallback:
// try use the locale specific default fonts defined in VCL.xcu // try use the locale specific default fonts defined in VCL.xcu
......
...@@ -2867,7 +2867,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -2867,7 +2867,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetIconFont( aIconFont ); aStyleSettings.SetIconFont( aIconFont );
// We prefer Arial in the russian version, because MS Sans Serif // We prefer Arial in the russian version, because MS Sans Serif
// is to wide for the dialogs // is to wide for the dialogs
if ( rSettings.GetLanguage() == LANGUAGE_RUSSIAN ) if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
{ {
XubString aFontName = aAppFont.GetName(); XubString aFontName = aAppFont.GetName();
XubString aFirstName = aFontName.GetToken( 0, ';' ); XubString aFirstName = aFontName.GetToken( 0, ';' );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment