[Libreoffice-commits] .: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/file_library_ooo.scp |    2 +-
 scp2/source/ooo/file_ooo.scp         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10472ce50310a6290a1db861cceea127b5c581a3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 16 11:18:47 2011 +0200

    Exclude java_uno_accessbridge.jar and .dll if no SOLAR_JAVA

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2349c4b..54836a8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifdef WNT
+#if defined SOLAR_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
     BIN_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2071e1e..336351c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -423,7 +423,7 @@ File gid_File_Help_Schart_Zip
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
-#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
+#if defined SOLAR_JAVA && defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
 
 File gid_File_Jar_Accessbridge
     TXT_FILE_BODY;