diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-07 16:54:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-07 17:03:00 +0200 |
| commit | 708229dc96533b6f165b82ce4d9e07537d1ce8b1 (patch) | |
| tree | 6211109a5c1cd20d87acd6806d0246ebf28ee140 /scp2 | |
| parent | LocalOfficeConnection description must end in ServiceManager (diff) | |
| download | core-708229dc96533b6f165b82ce4d9e07537d1ce8b1.tar.gz core-708229dc96533b6f165b82ce4d9e07537d1ce8b1.zip | |
fdo#49580: Fix bean after gbuild'ification
4478b739ddade09425d496cbddee1542fdfd5e9b "convert bean to gbuild and add to
tail_build" broke the following:
* The name of the officebean dynamic library must not be changed (by adding the
"lo" extension), as code in officebean.jar uses it in NativeLibraryLoader.
* With gbuild's per-default hidden visibility, JNIEXPORT functions must instead
use SAL_DLLPUBLIC_EXPORT. (Windows-only code in bean/native/win32/ should be
safe to continue using JNIEXPORT.)
Change-Id: I I3c312dd05c90421ba0c726496b7149a26d155604
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 63b2f8f350d8..83f125eddc8a 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -914,7 +914,16 @@ STD_LIB_FILE( gid_File_Lib_Offacc, offacc) #ifdef SOLAR_JAVA #ifndef MACOSX -STD_LIB_FILE(gid_File_Lib_Officebean, officebean) +File gid_File_Lib_Officebean + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT2(libofficebean,UNXSUFFIX)); + #else + Name = "officebean.dll"; + #endif +End #endif #endif |