summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-15 13:13:29 +0100
committerJan Holesovsky <kendy@suse.cz>2012-02-15 13:58:52 +0100
commit78a5d35ec1907e4b5add1014801dbac992cee48e (patch)
treefc2a66b5e72ce8127eaba2f1363e92380b31a92b
parent24dfc1a6238902a122f5cf835c83b2f54b8819fb (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. Signed-off-by: Jan Holesovsky <kendy@suse.cz>
-rw-r--r--scp2/source/ooo/file_ooo.scp13
1 files changed, 3 insertions, 10 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index dd6cd742d0b4..7f1cc64d7081 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -376,16 +376,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
@@ -423,6 +413,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