14 files changed, 99 insertions, 22 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index ee8071d4fdea..a66be3a16cce 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -116,6 +116,10 @@
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,PATCH)
 
+#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (ARCHIVE,HELPPACK)
+
 #define ARCHIVE_SUBST_FILE_BODY \
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,SUBSTITUTE)
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 3d209912479c..14b95922f304 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -74,9 +74,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
     Patchfiles = (); 
+    Styles = (ACRHIVE,HELPPACK);
 End
 
 File gid_File_Share_Registry_Base_Xcd
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 0c0aec368790..7a2f374a8ced 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
 
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
     Patchfiles = ();
 End
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 357e01f3cc00..ed5aa45b6c78 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,7 +36,7 @@ End
 
 File gid_File_Help_Sdraw_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
     Patchfiles = (); 
 End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 00dde2ca9162..7793370cb233 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -47,7 +47,7 @@ End
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE,DONT_OVERWRITE);
+    Styles = (ARCHIVE,DONT_OVERWRITE,HELPPACK);
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
     Patchfiles = (); 
 End
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 4da9f1a23bbc..63b87b24624b 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -52,7 +52,7 @@ End
 
 File gid_File_Help_Smath_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
     Patchfiles = ();
 End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index ea53086d2e32..941c70cdfa14 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1237,6 +1237,7 @@ End
 Directory gid_Dir_Help_Isolanguage
     ParentID = gid_Dir_Help;
     DIR_ISOLANGUAGE_ALL_LANG;
+    Styles = (HELPPACK);
 End
 
 #ifdef UNX
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 8c425b837c6c..1b10786434e6 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -399,7 +399,7 @@ STD_RES_FILE( gid_File_Res_Eme, eme )
 
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(shared);
     Patchfiles = ();
 End
@@ -412,14 +412,14 @@ End
 
 File gid_File_Help_Sbasic_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sbasic);
     Patchfiles = ();
 End
 
 File gid_File_Help_Schart_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 8220876ec26a..f41faedc45c5 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -290,6 +290,8 @@ PARFILES=                          \
         module_hidden_ooo.par      \
         module_langpack.par        \
         module_lang_template.par   \
+        module_helppack.par        \
+        module_help_template.par   \
         module_java.par            \
         module_systemint.par       \
         module_improvement.par     \
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
new file mode 100644
index 000000000000..15f8834f1723
--- /dev/null
+++ b/scp2/source/ooo/module_help_template.scp
@@ -0,0 +1,38 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+Module gid_Module_Helppack_Help_Template
+    ParentID = gid_Module_Helppack_Helproot;
+    Name = "gid_Module_Helppack_Help_Template";
+    Description = "gid_Module_Helppack_Help_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (gid_File_Help_Common_Zip,
+             gid_File_Help_Sbasic_Zip,
+             gid_File_Help_Schart_Zip);
+End
+
+#include "allhelpmodules_root.inc"
diff --git a/scp2/source/ooo/module_helppack.scp b/scp2/source/ooo/module_helppack.scp
new file mode 100644
index 000000000000..9cc9b444ca62
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.scp
@@ -0,0 +1,38 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Helppack_Helproot
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
+    Styles = (SHOW_MULTILINGUAL_ONLY);
+End
+
+#include "allhelpmodules.inc"
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index e95ca3238523..8cfc353729d5 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -114,17 +114,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_UpdChk,
              gid_File_Res_Upd);
 End
-
-Module gid_Module_Langpack_Help_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Help_Template";
-    Description = "gid_Module_Langpack_Help_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Common_Zip,
-             gid_File_Help_Sbasic_Zip,
-             gid_File_Help_Schart_Zip);
-End
-
 Module gid_Module_Langpack_Fonts_Template
     ParentID = gid_Module_Langpack_Languageroot;
     Name = "gid_Module_Langpack_Fonts_Template";
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 91ec1ff5c195..46b9ac24daa3 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -40,9 +40,9 @@ TARGET=templates
 COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 .EXPORT : COMPLETELANGISO_VAR
 
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc
+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
 
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
 .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
 PHONYTEMPL=.PHONY
 .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
@@ -50,3 +50,7 @@ $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
     @@-$(RENAME) $@ $@.tmp
     $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
     @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
+$(INCCOM)$/allhelpmodules%.inc $(PHONYTEMPL) : module_helppack%.sct
+    @@-$(RENAME) $@ $@.tmp
+    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_help_track.mk
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 3d7c22b9e7a9..8d49c94eaa57 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -65,7 +65,7 @@ End
 
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
     Patchfiles = ();
 End