[Libreoffice-commits] .: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    2 +-
 vcl/unx/kde/salnativewidgets-kde.cxx          |    8 ++++----
 vcl/unx/kde4/KDESalFrame.cxx                  |   10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6344b00ea1d0ceed64212172f7f2b7c7a77cdabf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 22 13:06:17 2012 +0100

    Adapt some GetUILocale leftovers
    
    Change-Id: I0400858249d4722a3b5583febd82200e62a64b20

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1037d9d..7d99c32 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1304,7 +1304,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
 
     fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() );
     // match font to e.g. resolve "Sans"
-    psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
+    psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() );
     fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
                   aInfo.m_nID != 0 ? "succeeded" : "failed",
                   rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index ea8cbc4..1440b84 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1873,7 +1873,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         pKey = "titleFont";
         if ( pConfig->hasKey( pKey ) )
         {
-            Font aFont = toFont( pConfig->readFontEntry( pKey ), rSettings.GetUILocale() );
+            Font aFont = toFont( pConfig->readFontEntry( pKey ), rSettings.GetUILanguageTag().getLocale() );
             aStyleSettings.SetTitleFont( aFont );
             bSetTitleFont = true;
         }
@@ -1934,7 +1934,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) );
 
     // Font
-    Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
+    Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() );
 
     aStyleSettings.SetAppFont( aFont );
     aStyleSettings.SetHelpFont( aFont );
@@ -2005,7 +2005,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
             ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore;
 
         // Font
-        aFont = toFont( pMenuBar->font(), rSettings.GetUILocale() );
+        aFont = toFont( pMenuBar->font(), rSettings.GetUILanguageTag().getLocale() );
         aStyleSettings.SetMenuFont( aFont );
     }
 
@@ -2013,7 +2013,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     KToolBar *pToolBar = qMainWindow.toolBar();
     if ( pToolBar )
     {
-        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );
+        aFont = toFont( pToolBar->font(), rSettings.GetUILanguageTag().getLocale() );
         aStyleSettings.SetToolFont( aFont );
     }
 
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 1242a3c..6f3fe53 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -192,7 +192,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         pKey = "titleFont";
         if ( aGroup.hasKey( pKey ) )
         {
-            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() );
+            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() );
             style.SetTitleFont( aFont );
             bSetTitleFont = true;
         }
@@ -207,7 +207,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         pKey = "toolbarFont";
         if ( aGroup.hasKey( pKey ) )
         {
-            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() );
+            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() );
             style.SetToolFont( aFont );
         }
     }
@@ -263,7 +263,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText )));
 
     // Font
-    Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
+    Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() );
 
     style.SetAppFont( aFont );
 
@@ -284,7 +284,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     }
     style.SetFloatTitleFont( aFont );
 
-    style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale()));
+    style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILanguageTag().getLocale()));
 
     int flash_time = QApplication::cursorFlashTime();
     style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
@@ -320,7 +320,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
             ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore;
 
         // Font
-        aFont = toFont( pMenuBar->font(), rSettings.GetUILocale() );
+        aFont = toFont( pMenuBar->font(), rSettings.GetUILanguageTag().getLocale() );
         style.SetMenuFont( aFont );
     }