diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 22:53:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 22:53:14 +0200 |
| commit | 18539f46e96c53d5c33217df5b311cd95f6a0caf (patch) | |
| tree | eba6ec2b19822a38314759c2e52f1b3d5e345f69 /cppuhelper | |
| parent | f6848ac7375fec8dd3e883c6efe6206dda88fe63 (diff) | |
Adapt cppu::bootstrap to new Mac OS X LibreOffice.app layout
Change-Id: I60db70c38d138455230ee56a26d840aa68885b44
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 4cfaafdb8caa..e81f4147f346 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 |