scp2/source/ooo/file_ooo.scp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
New commits: commit 78a5d35ec1907e4b5add1014801dbac992cee48e Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 15 13:13:29 2012 +0100 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 <ke...@suse.cz> diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index dd6cd74..7f1cc64 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 commit 24dfc1a6238902a122f5cf835c83b2f54b8819fb Author: Masataka Shinke <mshi...@users.sourceforge.jp> Date: Wed Feb 15 13:10:44 2012 +0100 fdo#45530: Accessibility does not work on WNT Signed-off-by: Jan Holesovsky <ke...@suse.cz> diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e7bc85a..dd6cd74 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -423,6 +423,7 @@ 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 ) +STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif #ifdef SOLAR_JAVA _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits