[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 2 commits - readlicense_oo/Package_files.mk sfx2/source

[Andras Timar]

 readlicense_oo/Package_files.mk |   11 +++++++++--
 sfx2/source/appl/appserv.cxx    |    5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 45e75a51373c97fa192f68aa1f43c3022a804cf9
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Thu Jun 18 16:24:28 2015 +0200

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

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 29a47a0..1c3e1bd 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
     using namespace osl;
     DirectoryItem aDirItem;
 
+#ifdef MACOSX
+    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())
commit 9b5fe57adc4b9c195fd52bc31bc9dc9aafa1509e
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Thu Jun 18 15:43:15 2015 +0200

    Put LICENSE/NOTICE files to Resources on OSX in instdir case, too
    
    (cherry picked from commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5)
    
    Conflicts:
        readlicense_oo/Package_files.mk
    
    Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 025e13b..1fa672d 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,13 +15,20 @@ ifneq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
 endif
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
 $(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
 
 # vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits