[Libreoffice-commits] core.git: cppuhelper/source

[Stephan Bergmann]

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

New commits:
commit 18539f46e96c53d5c33217df5b311cd95f6a0caf
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 4cfaafd..e81f414 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -119,7 +119,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 defined MACOSX
+                    "../Resources/"
+#endif
+                    SAL_CONFIGFILE("fundamental")));
         }
 
         // create default local component context