diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-22 12:26:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-22 12:34:59 +0100 |
| commit | 9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch) | |
| tree | 80705ccc2382e7440ea76f62a544d64d12d1ce4f /vcl/unx | |
| parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) | |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 |
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", |