[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - sfx2/source

[Andras Timar]

 sfx2/source/appl/appserv.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 4e6e1fc9690c48654809f05ced643508d1819bac
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jun 18 16:24:28 2015 +0200

    Make 'Show License' button work on OS X
    
    (cherry picked from commit ed4fe167a9705e714970ab5725aaae8854b1125b)
    
    Change-Id: I947033790476f982efd6a275831d2439b2859d8f

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7730e32..f3303f5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -199,8 +199,13 @@ static bool checkURL( const char *pName, const char *pExt, OUString &rURL )
     using namespace osl;
     DirectoryItem aDirItem;
 
+#ifdef HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+    rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+           OUString::createFromAscii( pExt );
+#else
     rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
            OUString::createFromAscii( pExt );
+#endif
     rtl::Bootstrap::expandMacros( rURL );
 
     if (!rURL.isEmpty())