--- helpcontent2/makefile.pmk.orig	2007-01-14 02:41:51.000000000 +0100
+++ helpcontent2/makefile.pmk	2007-01-14 02:44:19.000000000 +0100
@@ -36,9 +36,7 @@
 SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
 HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
 
-.IF "$(SOLAR_JAVA)"!=""
 ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
-.ENDIF
 
 $(HLANGXHPFILES) : $$(@:d)thisdir.created
 
--- helpcontent2/helpers/linkmakefile.template.orig	2007-01-14 02:42:04.000000000 +0100
+++ helpcontent2/helpers/linkmakefile.template	2007-01-14 02:44:30.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/%module%$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=%module%
--- helpcontent2/util/schart/makefile.mk.orig	2007-01-14 02:42:41.000000000 +0100
+++ helpcontent2/util/schart/makefile.mk	2007-01-14 02:44:47.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/schart$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=schart
--- helpcontent2/util/sdatabase/makefile.mk.orig	2007-01-14 02:42:54.000000000 +0100
+++ helpcontent2/util/sdatabase/makefile.mk	2007-01-14 02:45:09.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=sdatabase
--- helpcontent2/util/sdraw/makefile.mk.orig	2007-01-14 02:43:04.000000000 +0100
+++ helpcontent2/util/sdraw/makefile.mk	2007-01-14 02:45:28.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=sdraw
--- helpcontent2/util/simpress/makefile.mk.orig	2007-01-14 02:43:13.000000000 +0100
+++ helpcontent2/util/simpress/makefile.mk	2007-01-14 02:45:45.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/simpress$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=simpress
--- helpcontent2/util/swriter/makefile.mk.orig	2007-01-14 02:43:20.000000000 +0100
+++ helpcontent2/util/swriter/makefile.mk	2007-01-14 02:45:54.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=swriter
--- helpcontent2/util/sbasic/makefile.mk.orig	2007-01-14 02:43:28.000000000 +0100
+++ helpcontent2/util/sbasic/makefile.mk	2007-01-14 02:46:05.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/sbasic$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=sbasic
--- helpcontent2/util/scalc/makefile.mk.orig	2007-01-14 02:43:36.000000000 +0100
+++ helpcontent2/util/scalc/makefile.mk	2007-01-14 02:46:15.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=scalc
--- helpcontent2/util/smath/makefile.mk.orig	2007-01-14 02:43:45.000000000 +0100
+++ helpcontent2/util/smath/makefile.mk	2007-01-14 02:46:22.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=smath
--- helpcontent2/util/shared/makefile.mk.orig	2007-01-14 02:44:05.000000000 +0100
+++ helpcontent2/util/shared/makefile.mk	2007-01-14 02:46:29.000000000 +0100
@@ -26,7 +26,6 @@
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -34,7 +33,6 @@
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-.ENDIF			# "$(SOLAR_JAVA)"!=""
 
 
 LINKNAME=shared
--- scp2/source/ooo/file_ooo.scp.orig	2007-01-14 12:13:05.000000000 +0100
+++ scp2/source/ooo/file_ooo.scp	2007-01-14 12:13:45.000000000 +0100
@@ -606,8 +606,6 @@
 
 STD_RES_FILE( gid_File_Res_Eme, eme )
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -652,8 +650,6 @@
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
-#endif
-
 File gid_File_Html_Thirdpartylicensereadme
     Name = "THIRDPARTYLICENSEREADME.html";
 #ifndef MACOSX
--- scp2/source/base/file_base.scp.orig	2007-01-14 12:14:05.000000000 +0100
+++ scp2/source/base/file_base.scp	2007-01-14 12:14:19.000000000 +0100
@@ -64,8 +64,6 @@
 
 #endif
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -85,8 +83,6 @@
                   "sdatabase.idx/SCHEMA"); 
 End
 
-#endif
-
 File gid_File_Registry_Spool_Oo_Setup_Base_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
--- scp2/source/impress/file_impress.scp.orig	2007-01-14 12:17:47.000000000 +0100
+++ scp2/source/impress/file_impress.scp	2007-01-14 12:18:15.000000000 +0100
@@ -52,8 +52,6 @@
     Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu";
 End
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
     TXT_FILE_BODY;
@@ -75,8 +73,6 @@
                   "simpress.idx/SCHEMA"); 
 End
 
-#endif
-
 File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
--- scp2/source/math/file_math.scp.orig	2007-01-14 12:18:58.000000000 +0100
+++ scp2/source/math/file_math.scp	2007-01-14 12:19:17.000000000 +0100
@@ -77,8 +77,6 @@
     Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu";
 End
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Smath_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -100,8 +98,6 @@
                   "smath.idx/SCHEMA");
 End
 
-#endif
-
 File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
--- scp2/source/draw/file_draw.scp.orig	2007-01-14 12:19:38.000000000 +0100
+++ scp2/source/draw/file_draw.scp	2007-01-14 12:19:47.000000000 +0100
@@ -42,8 +42,6 @@
     Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu";
 End
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Sdraw_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -63,8 +61,6 @@
                   "sdraw.idx/SCHEMA"); 
 End
 
-#endif
-
 File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
--- scp2/source/calc/file_calc.scp.orig	2007-01-14 12:21:19.000000000 +0100
+++ scp2/source/calc/file_calc.scp	2007-01-14 12:22:13.000000000 +0100
@@ -110,8 +110,6 @@
     Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu";
 End
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -132,8 +130,6 @@
                   "scalc.idx/SCHEMA"); 
 End
 
-#endif
-
 // new user interface configuration files
 /*
 File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
--- scp2/source/writer/file_writer.scp.orig	2007-01-14 12:23:51.000000000 +0100
+++ scp2/source/writer/file_writer.scp	2007-01-14 12:24:14.000000000 +0100
@@ -85,8 +85,6 @@
     Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu";
 End
 
-#ifdef SOLAR_JAVA
-
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_PATCH;
@@ -107,8 +105,6 @@
                   "swriter.idx/SCHEMA");
 End
 
-#endif
-
 /*
 File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
     TXT_FILE_BODY;
