[Libreoffice-commits] .: vcl/win

[Libreoffice Gerrit user]

 vcl/win/source/gdi/salgdi3.cxx     |    4 ++--
 vcl/win/source/window/salframe.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d98e8a22a0acf6468614e99da7192894ca7f06d7
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Nov 22 13:05:23 2012 +0100

    AllSettings LanguageTag also in win-only files
    
    Change-Id: I7a64a3d582d064608583a80d206745a77f474cfa

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 134c1a3..597df76 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -419,7 +419,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
         // TODO: use the default-CJK language selected in
         //  Tools->Options->LangSettings->Languages when it becomes available here
         if( !nDefaultLang )
-            nDefaultLang = Application::GetSettings().GetUILanguage();
+            nDefaultLang = Application::GetSettings().GetUILanguageTag().getLanguageType();
 
         LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE;
 
@@ -555,7 +555,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
 
     // fall back to default UI locale if the missing characters are inconclusive
     if( eLang == LANGUAGE_DONTKNOW )
-        aLocale = Application::GetSettings().GetUILocale();
+        aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
 
     // first level fallback:
     // try use the locale specific default fonts defined in VCL.xcu
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 4fb8e6c..bffd400 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2867,7 +2867,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetIconFont( aIconFont );
     // We prefer Arial in the russian version, because MS Sans Serif
     // is to wide for the dialogs
-    if ( rSettings.GetLanguage() == LANGUAGE_RUSSIAN )
+    if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
     {
         XubString aFontName = aAppFont.GetName();
         XubString aFirstName = aFontName.GetToken( 0, ';' );