summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-07-12 01:57:33 +0200
committerEike Rathke <erack@redhat.com>2013-07-12 01:58:58 +0200
commit5a795e01e02995880391a56d67065a0621d4b622 (patch)
tree388f858fec8b172ecde51c3d68028a3a9cd6efa6
parentcde58731dc2e0da78cf761ff95a5df214296d041 (diff)
use LanguageTag::getGlibcLocaleString()
Change-Id: I3770056e3a8039dae5c5cfe686f445d4668b5995
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx13
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 86dcf8d7ef66..eabea01c04e9 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -984,23 +984,12 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
OString aTitle(OUStringToOString(rWMName,
osl_getThreadTextEncoding()));
- /* FIXME-BCP47: what slumbering dogs may we wake up here? */
OString aWMLocale;
rtl_Locale* pLocale = NULL;
osl_getProcessLocale( &pLocale );
if( pLocale )
{
- OUString aLocaleString( pLocale->Language );
- OUString aCountry( pLocale->Country );
- OUString aVariant( pLocale->Variant );
-
- if( !aCountry.isEmpty() )
- {
- aLocaleString += OUString("_");
- aLocaleString += aCountry;
- }
- if( !aVariant.isEmpty() )
- aLocaleString += aVariant;
+ OUString aLocaleString( LanguageTag( *pLocale).getGlibcLocaleString( OUString()));
aWMLocale = OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 );
}
else