From 9eb31913cc9f35fb792bf8c8051f44ba11e16a5c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 23 May 2015 10:09:18 +0100 Subject: [PATCH 003/398] Look for libsofficeapp.dylib in the right place on OS X Change-Id: Icef6b70081b15d4b8d99eb4ba7103f059e8d00e4 (cherry picked from commit a1aa2cdaa7c467376c1f7824e2b6a83cb252a39a) --- desktop/source/lib/init.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b2076c622bf1..88cbcbd8d285 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -899,6 +899,8 @@ static bool initialize_uno(const OUString& aAppProgramURL) #ifdef IOS // For iOS we already hardocde the inifile as "rc" in the .app directory. (void) aAppProgramURL; +#elif defined MACOSX + rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" SAL_CONFIGFILE("soffice")); #else rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice")); #endif -- 2.12.0