diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-02-15 13:13:29 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-02-15 13:17:19 +0100 |
| commit | 9c4581a6b61c0836c3a44eaaf454b9ba560e937a (patch) | |
| tree | f90120b3bad60e7d8dc3135feedfcdb422f27f54 | |
| parent | fbe60c962259ae0449acd65e74fd790530045e93 (diff) | |
fdo#45530: scp2: java accessibilty bridge cleanup:
AFAIK java_uno_accessbridge.jar is only required on WNT.
Also remove the duplicate old definition of gid_File_Jar_Accessbridge
that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa.
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e2c0c68fc843..4d5d771e7a25 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -379,16 +379,6 @@ File gid_File_Help_Schart_Zip End #endif -#if defined SOLAR_JAVA && defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT - -File gid_File_Jar_Accessbridge - TXT_FILE_BODY; - Name = "java_uno_accessbridge.jar"; - Dir = gid_Dir_Classes; - Styles = (PACKED,DONT_OVERWRITE); -End - -#endif #ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE @@ -426,6 +416,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) +#endif + +#if defined SOLAR_JAVA && defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif |