Adding LANGUAGEMODULE flag to helppack files

9 files changed, 15 insertions, 63 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index a66be3a16..4344662f4 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -118,7 +118,7 @@
 
 #define ARCHIVE_TXT_FILE_BODY_HELPPACK \
         TXT_FILE_BODY; \
-        Styles = (ARCHIVE,HELPPACK)
+        Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
 
 #define ARCHIVE_SUBST_FILE_BODY \
         TXT_FILE_BODY; \
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index dc4d76fcf..1a245a657 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -54,15 +54,6 @@ Module gid_Module_Prg_Base_Bin
     );
 End
 
-// Module gid_Module_Prg_Base_Help
-//     MOD_NAME_DESC ( MODULE_PRG_BASE_HELP );
-//     ParentID = gid_Module_Prg_Base;
-//     Sortkey = "200";
-//     Minimal = NO;
-//     Default = YES;
-//     Files = (gid_File_Help_Sdatabase_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Base
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Base";
@@ -81,8 +72,7 @@ Module gid_Module_Langpack_Base_Template
     Name = "gid_Module_Langpack_Base_Template";
     Description = "gid_Module_Langpack_Base_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdatabase_Zip,
-             gid_File_Res_Abp,
+    Files = (gid_File_Res_Abp,
              gid_File_Res_Adabasui,
              gid_File_Res_Cnr,
              gid_File_Res_Dbp,
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0c26c3a7a..0e5e7903e 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Calc_Bin
     gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
-// Module gid_Module_Prg_Calc_Help
-//    MOD_NAME_DESC ( MODULE_PRG_CALC_HELP );
-//    ParentID = gid_Module_Prg_Calc;
-//    Sortkey = "200";
-//    Default = YES;
-//    Files = (gid_File_Help_Scalc_Zip);
-// End
-
 Module gid_Module_Prg_Calc_Addins
     MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
     Styles = (HIDDEN_ROOT);
@@ -82,8 +74,7 @@ Module gid_Module_Langpack_Calc_Template
     Name = "gid_Module_Langpack_Calc_Template";
     Description = "gid_Module_Langpack_Calc_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Scalc_Zip,
-             gid_File_Res_Analysis,
+    Files = (gid_File_Res_Analysis,
              gid_File_Res_Date,
              gid_File_Res_Sc,
              gid_File_Res_Solver);
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 3226e08ea..b5bec12dc 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Draw_Bin
     gid_File_Tmp_Userinstall_Draw_Inf);
 End
 
-// Module gid_Module_Prg_Draw_Help
-//     MOD_NAME_DESC ( MODULE_PRG_DRAW_HELP );
-//     ParentID = gid_Module_Prg_Draw;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Sdraw_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Draw
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Draw";
@@ -73,7 +65,7 @@ Module gid_Module_Langpack_Draw_Template
     Name = "gid_Module_Langpack_Draw_Template";
     Description = "gid_Module_Langpack_Draw_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdraw_Zip);
+    Files = ();
 End
 
 #include "alllangmodules_draw.inc"
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 1682b88d0..8e9a7389f 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -48,14 +48,6 @@ Module gid_Module_Prg_Impress_Bin
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
-// Module gid_Module_Prg_Impress_Help
-//     MOD_NAME_DESC ( MODULE_PRG_IMPRESS_HELP );
-//     ParentID = gid_Module_Prg_Impress;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Simpress_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Impress
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Impress";
@@ -74,7 +66,7 @@ Module gid_Module_Langpack_Impress_Template
     Name = "gid_Module_Langpack_Impress_Template";
     Description = "gid_Module_Langpack_Impress_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Simpress_Zip);
+    Files = ();
 End
 
 Module gid_Module_Prg_Impress_MSO_Reg
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index e9c084ba9..960c3203b 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Math_Bin
     gid_File_Tmp_Userinstall_Math_Inf);
 End
 
-// Module gid_Module_Prg_Math_Help
-//     MOD_NAME_DESC ( MODULE_PRG_MATH_HELP );
-//     ParentID = gid_Module_Prg_Math;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Smath_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Math
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Math";
@@ -73,8 +65,7 @@ Module gid_Module_Langpack_Math_Template
     Name = "gid_Module_Langpack_Math_Template";
     Description = "gid_Module_Langpack_Math_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Smath_Zip,
-             gid_File_Res_Sm);
+    Files = (gid_File_Res_Sm);
 End
 
 #include "alllangmodules_math.inc"
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
index 15f8834f1..34a102e1e 100644
--- a/scp2/source/ooo/module_help_template.scp
+++ b/scp2/source/ooo/module_help_template.scp
@@ -32,7 +32,13 @@ Module gid_Module_Helppack_Help_Template
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Help_Common_Zip,
              gid_File_Help_Sbasic_Zip,
-             gid_File_Help_Schart_Zip);
+             gid_File_Help_Scalc_Zip,
+             gid_File_Help_Schart_Zip,
+             gid_File_Help_Sdatabase_Zip,
+             gid_File_Help_Sdraw_Zip,
+             gid_File_Help_Simpress_Zip,
+             gid_File_Help_Smath_Zip,
+             gid_File_Help_Swriter_Zip);
 End
 
 #include "allhelpmodules_root.inc"
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
index d0501ba0d..32b4a7a15 100644
--- a/scp2/source/templates/module_helppack.sct
+++ b/scp2/source/templates/module_helppack.sct
@@ -30,5 +30,5 @@ Module gid_Module_Helppack_Root_<LANGUAGE_>
     Sortkey = "<SORTKEY>";
     Language = "<LANGUAGE>";
     MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
-    Styles =(HELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+    Styles =(HELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
 End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index f6fdb6517..3071059f2 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -62,15 +62,6 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
-// Module gid_Module_Prg_Wrt_Help
-//    MOD_NAME_DESC ( MODULE_PRG_WRT_HELP );
-//    ParentID = gid_Module_Prg_Wrt;
-//    Sortkey = "200";
-//    Default = YES;
-//    Minimal = YES;
-//    Files = (gid_File_Help_Swriter_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Wrt
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Wrt";
@@ -89,8 +80,7 @@ Module gid_Module_Langpack_Writer_Template
     Name = "gid_Module_Langpack_Writer_Template";
     Description = "gid_Module_Langpack_Writer_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Swriter_Zip,
-             gid_File_Res_T602Filter);
+    Files = (gid_File_Res_T602Filter);
 End
 
 Module gid_Module_Prg_Wrt_MSO_Reg