summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-11-22 12:26:52 +0100
committerEike Rathke <erack@redhat.com>2012-11-22 12:34:59 +0100
commit9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch)
tree80705ccc2382e7440ea76f62a544d64d12d1ce4f /vcl/unx/gtk
parent9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff)
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx3
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx2
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 15e29b10405e..2481e314c9d5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -187,7 +187,8 @@ void SalGtkPicker::setGtkLanguage()
if (bSet)
return;
- ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
+ /* FIXME-BCP47: let LanguageTag create glibc locale string! */
+ ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
rtl::OUStringBuffer aBuffer;
aBuffer.append( aLocale.Language );
aBuffer.appendAscii( "_" );
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 5a1d37693e22..839750d79ebd 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3911,7 +3911,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
#endif
// match font to e.g. resolve "Sans"
- psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
+ psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() );
#if OSL_DEBUG_LEVEL > 1
std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",