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

[Stephan Bergmann]

 cppuhelper/source/bootstrap.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c655775fba137aaf037b6e78c3cd2005e667f420
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 29 22:53:08 2014 +0200

    Adapt cppu::bootstrap to new Mac OS X LibreOffice.app layout
    
    Change-Id: I60db70c38d138455230ee56a26d840aa68885b44

diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index ae2a9f0..b043758 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "sal/config.h"
 
 #include <cstring>
@@ -119,7 +121,12 @@ Reference< XComponentContext > SAL_CALL bootstrap()
         if (!Bootstrap::get("URE_BOOTSTRAP", uri)) {
             Bootstrap::set(
                 "URE_BOOTSTRAP",
-                Bootstrap::encode(path + SAL_CONFIGFILE("fundamental")));
+                Bootstrap::encode(
+                    path +
+#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+                    "../Resources/"
+#endif
+                    SAL_CONFIGFILE("fundamental")));
         }
 
         // create default local component context