diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-13 23:20:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-14 10:24:44 +0000 |
| commit | c225c859f11da09ff20b3eb2a9f81ea32b02f6f3 (patch) | |
| tree | c25c96805caba57b297e6ff50e966fce38668bb1 /bean | |
| parent | 4ffa47d9c1dafac4712b7fcac9a7df25b3392386 (diff) | |
More java.lang.System.mapLibraryName dylib vs. jnilib confusion
...like a76261ac9e40eb57e942db2c7aea8b8a5e904ff2
Change-Id: I803dc81344efb5e8021d9ef4146c06ecf82ca63b
(cherry picked from commit 0d396800021684a8c0875e45ed1440011fd7f9b0)
Reviewed-on: https://gerrit.libreoffice.org/8040
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/com/sun/star/beans/LocalOfficeConnection.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java index b742fb3a7027..9bf73b429169 100644 --- a/bean/com/sun/star/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/beans/LocalOfficeConnection.java @@ -78,6 +78,15 @@ public class LocalOfficeConnection // load libofficebean.so/officebean.dll String aSharedLibName = getProgramPath() + java.io.File.separator + System.mapLibraryName(OFFICE_LIB_NAME); + // At least Oracle's 1.7.0_51 now maps to .dylib rather than .jnilib: + if (System.getProperty("os.name").startsWith("Mac") + && aSharedLibName.endsWith(".dylib")) + { + aSharedLibName + = aSharedLibName.substring( + 0, aSharedLibName.length() - "dylib".length()) + + "jnilib"; + } System.load( aSharedLibName ); } |