INTEGRATION: CWS native110 (1.16.14); FILE MERGED

2007/12/06 17:13:28 is 1.16.14.3: #i82248# file test should not be committed
2007/11/12 16:06:56 is 1.16.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.16.14.1: #i82251# repackaging, part 3

1 files changed, 12 insertions, 24 deletions

diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 4ab81008a07a..880af2ac4c67 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: module_calc.scp,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: kz $ $Date: 2007-09-06 10:04:51 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 17:07:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,18 +40,6 @@ Module gid_Module_Prg_Calc
     MOD_NAME_DESC ( MODULE_PRG_CALC );
     ParentID = gid_Module_Prg;
     Sortkey = "200";
-	Script = "shellscripts_module.txt"
-	Solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
-	Solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
-	Packagename = "%UNIXPRODUCTNAME-calc"
-	Linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
-	Freebsdrequires = "%UNIXPRODUCTNAME-core01"
-	Requires = "%UNIXPRODUCTNAME-core01"
-	Copyright = "1999-2007 by %PRODUCTNAME"
-	Solariscopyright = "solariscopyrightfile"
-	Vendor = "%PRODUCTNAME"
-	Description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
-	Destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 End
 
 // #110743# Added gid_File_Lib_Bf_Sc and gid_File_Res_Bf_Sc for binfilter
@@ -61,24 +49,24 @@ Module gid_Module_Prg_Calc_Bin
     Sortkey = "100";
     Minimal = YES;
     Default = YES;
-    Files = (gid_File_Lib_Calc,gid_File_Exe_Scalc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scd,gid_File_Res_Sc,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+    Files = (gid_File_Lib_Calc,gid_File_Exe_Scalc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
     gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Xdg_Calc, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
-    gid_File_Lib_Bf_Sc,gid_File_Res_Bf_Sc,gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+    gid_File_Lib_Bf_Sc,gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, 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_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 );
     ParentID = gid_Module_Prg_Calc;
     Sortkey = "700";
     Default = YES;
-    Files = (gid_File_Lib_Date,gid_File_Res_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis,gid_File_Res_Analysis);
+    Files = (gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis);
 End