summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/saldisp.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx3
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx2
4 files changed, 5 insertions, 4 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 3310e6da6f5d..725bd19f1d9f 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -739,7 +739,7 @@ sal_uInt16 SalDisplay::GetIndicatorState() const
rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
{
- rtl::OUString aLang = Application::GetSettings().GetUILocale().Language;
+ rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
rtl::OUString aRet;
// return an empty string for keysyms that are not bound to
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index d5951112e575..d746b726d70d 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -132,7 +132,7 @@ namespace psp
if( bInsertDefault && aLoc.Language.isEmpty() )
{
// empty locale requested, fill in application UI locale
- aLoc = Application::GetSettings().GetUILocale();
+ aLoc = Application::GetSettings().GetUILanguageTag().getLocale();
#if OSL_DEBUG_LEVEL > 1
static const char* pEnvLocale = getenv( "SAL_PPDPARSER_LOCALE" );
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",