diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-30 17:26:32 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-30 17:27:07 +0100 |
| commit | 73bda5058bcef6be9a3185aa46375c7b147ffa22 (patch) | |
| tree | f278b7b2dd94d0059bc25f98fa050d4f40a8c006 /vcl/source/app | |
| parent | 84f24288ee5883cd533985ee9ff66b60046bd4ac (diff) | |
ditched rtl::OLocale
Change-Id: I3f4a09c82df1bc71759331705c502320f973d4bb
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/brand.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index b24307e54c06..74d55104e62c 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -74,13 +74,12 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) rtl_Locale *pLoc = NULL; osl_getProcessLocale (&pLoc); - rtl::OLocale aLoc( pLoc ); + LanguageTag aLanguageTag( *pLoc); rtl::OUString aName = aBaseName + aPng; rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") + - aLoc.getLanguage() + - rtl::OUString("_") + - aLoc.getCountry() + aPng ); + aLanguageTag.getBcp47() + + aPng ); return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) || loadPng ("$BRAND_BASE_DIR/program", aLocaleName, rBitmap) || @@ -97,13 +96,12 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG (const char* pName) rtl_Locale *pLoc = NULL; osl_getProcessLocale (&pLoc); - rtl::OLocale aLoc( pLoc ); + LanguageTag aLanguageTag( *pLoc); rtl::OUString aName = aBaseName + aSvg; rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") + - aLoc.getLanguage() + - rtl::OUString("_") + - aLoc.getCountry() + aSvg ); + aLanguageTag.getBcp47() + + aSvg ); vcl::RenderGraphicRasterizer aRasterizer = loadSvg ("$BRAND_BASE_DIR/program/edition", aLocaleName); if (!aRasterizer.GetRenderGraphic().IsEmpty()) |