diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:55:32 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:55:32 +0000 |
commit | 6ae72a69826a7455f6f632f92d329644df92d2f4 (patch) | |
tree | 5a187163b17bd9354cd9fbb3a7970a21c80885dc /scp2/source/base | |
parent | 78e22b61ec793952daa8944c28d8dcb17afbad2e (diff) |
INTEGRATION: CWS native141 (1.14.16); FILE MERGED
2008/04/09 16:39:48 is 1.14.16.1: #i88109# no packages at nodes in java installer
Diffstat (limited to 'scp2/source/base')
-rw-r--r-- | scp2/source/base/module_base.scp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 20c2bf698016..b1938cb6beee 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: module_base.scp,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -31,7 +31,6 @@ #include "macros.inc" Module gid_Module_Prg_Base - PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_PRG_BASE); ParentID = gid_Module_Prg; Sortkey = "500"; @@ -39,11 +38,15 @@ Module gid_Module_Prg_Base End Module gid_Module_Prg_Base_Bin + PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_PRG_BASE_BIN ); ParentID = gid_Module_Prg_Base; Sortkey = "100"; Minimal = NO; Default = YES; + #ifdef UNX + Styles = (HIDDEN_ROOT); + #endif Files = ( gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu @@ -76,7 +79,11 @@ Module gid_Module_Brand_Prg_Base PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Base"; Description = "gid_Module_Brand_Prg_Base"; + #ifdef UNX + ParentID = gid_Module_Prg_Base; + #else ParentID = gid_Module_Prg_Base_Bin; + #endif Sortkey = "100"; Minimal = YES; Default = YES; |