[Libreoffice-commits] .: vcl/source

[Libreoffice Gerrit user]

 vcl/source/app/brand.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit bcd97c4adc2daa64cc2f9f074ac9726925ca93ea
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Fri Dec 21 20:54:44 2012 +0530

    About Dialog: Use edition path as well.

diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 03e999a..904c24a 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: */