diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-21 14:53:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-21 16:03:36 +0100 |
| commit | af0909f1b88a47db1ea0ea53cdac59daee42db0b (patch) | |
| tree | 427693e4459c617d67c2b5a186f0512a672418f9 /scp2 | |
| parent | b8156a37a62722ba7ef97d511150ac2ec55523bd (diff) | |
--enable-ia2 no longer disables Java access bridge
Just install both; 448727e598ca0c35ee9cd6f2c25a847c8147943b already made
IA2 an experimental feature with fallback to Java access bridge if
experimental mode is disabled.
Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990
(cherry picked from commit 31b91f6f8a7cacb062005d6ca2a7b5b2645a9799)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 68eae2e6aa26..e8be2289d48a 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -315,7 +315,7 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif -#if defined ENABLE_JAVA && defined WNT && !defined(ENABLE_IA2) +#if defined ENABLE_JAVA && defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif |