diff options
author | Muthu Subramanian <sumuthu@suse.com> | 2012-12-21 20:54:44 +0530 |
---|---|---|
committer | Muthu Subramanian <sumuthu@suse.com> | 2012-12-21 20:56:34 +0530 |
commit | bcd97c4adc2daa64cc2f9f074ac9726925ca93ea (patch) | |
tree | d81fcb14c372b52e0299f9407f12f8dbe7a9ebaf | |
parent | 901fe015dbbd4ea7b0ca579aa470d9f3430a6ac7 (diff) |
About Dialog: Use edition path as well.
-rw-r--r-- | vcl/source/app/brand.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 03e999ad8a07..904c24ab7c32 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -41,6 +41,14 @@ namespace { else return false; } + static bool loadSvg(rtl::OUString aUri, BitmapEx &rBitmap) + { + rtl::Bootstrap::expandMacros( aUri ); + INetURLObject aObj( aUri ); + SvgData aSvgData(aObj.PathToFileName()); + rBitmap = aSvgData.getReplacement(); + return !rBitmap.IsEmpty(); + } } bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) @@ -80,13 +88,9 @@ bool Application::LoadBrandSVG (const char *pName, BitmapEx &rBitmap) rtl::OUString aLocaleName = ( aBaseName + rtl::OUString("-") + aLanguageTag.getBcp47() + aSvg ); - //rtl::OUString uri = rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ) + aLocaleName; + rtl::OUString uriOpt = rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ) + aLocaleName; rtl::OUString uri = rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; - rtl::Bootstrap::expandMacros( uri ); - INetURLObject aObj( uri ); - SvgData aSvgData(aObj.PathToFileName()); - rBitmap = aSvgData.getReplacement(); - return true; + return ( loadSvg( uriOpt, rBitmap ) || loadSvg( uri, rBitmap ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |