diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-22 13:50:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-22 13:50:19 +0000 |
| commit | 1ebc89ba4ad88e937288e521f3731ddcb32f9fd2 (patch) | |
| tree | 47e17fcd5294d3ffdcd59b82e78587b50f232508 /scp2 | |
| parent | 313292e9d67b1b01715bb87219f6a324d9f07344 (diff) | |
INTEGRATION: CWS native76 (1.2.6); FILE MERGED
2007/01/10 12:59:33 is 1.2.6.1: #144470# small changes after native50
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/module_java.scp | 18 | ||||
| -rw-r--r-- | scp2/source/ooo/module_systemint.scp | 10 |
2 files changed, 10 insertions, 18 deletions
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp index ea2d66f37384..db96a68b070b 100644 --- a/scp2/source/ooo/module_java.scp +++ b/scp2/source/ooo/module_java.scp @@ -2,9 +2,9 @@ * * $RCSfile: module_java.scp,v $ * -* $Revision: 1.2 $ +* $Revision: 1.3 $ * -* last change: $Author: hr $ $Date: 2007-01-02 15:30:17 $ +* last change: $Author: obo $ $Date: 2007-01-22 14:49:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ Module gid_Module_Optional_Java ParentID = gid_Module_Optional; MOD_NAME_DESC ( MODULE_OPTIONAL_JAVA ); #ifdef WNT - Styles = (HIDDEN_ROOT,JAVAMODULE); + Styles = (JAVAMODULE); #elif defined (SOLARIS) Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE); #else @@ -85,11 +85,7 @@ Module gid_Module_Optional_Java_Runtime ParentID = gid_Module_Optional_Java; Name = "gid_Module_Optional_Java_Runtime"; Description = "gid_Module_Optional_Java_Runtime"; - #ifdef SOLARIS Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE); - #else - Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL); - #endif #if defined (SOLARIS) && defined (SPARC) PackageName = "SUNWj6rt_1_6_0_sparc.tar.gz"; #elif defined (SOLARIS) && defined (INTEL) @@ -105,11 +101,7 @@ Module gid_Module_Optional_Java_Config ParentID = gid_Module_Optional_Java; Name = "gid_Module_Optional_Java_Config"; Description = "gid_Module_Optional_Java_Config"; - #ifdef SOLARIS Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE); - #else - Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL); - #endif #if defined (SOLARIS) && defined (SPARC) PackageName = "SUNWj6cfg_1_6_0_sparc.tar.gz"; #elif defined (SOLARIS) && defined (INTEL) @@ -125,11 +117,7 @@ Module gid_Module_Optional_Java_Manual ParentID = gid_Module_Optional_Java; Name = "gid_Module_Optional_Java_Manual"; Description = "gid_Module_Optional_Java_Manual"; - #ifdef SOLARIS Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE); - #else - Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL); - #endif #if defined (SOLARIS) && defined (SPARC) PackageName = "SUNWj6man_1_6_0_sparc.tar.gz"; #elif defined (SOLARIS) && defined (INTEL) diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp index 5ad6fb276aa2..fa4e906692d7 100644 --- a/scp2/source/ooo/module_systemint.scp +++ b/scp2/source/ooo/module_systemint.scp @@ -4,9 +4,9 @@ * * $RCSfile: module_systemint.scp,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2007-01-02 15:31:19 $ + * last change: $Author: obo $ $Date: 2007-01-22 14:50:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,11 +36,15 @@ #include "macros.inc" Module gid_Module_Optional_Systemintegration + #ifdef WNT + ParentID = gid_Module_Root; + #else ParentID = gid_Module_Optional; + #endif Sortkey = "800"; MOD_NAME_DESC(MODULE_OPTIONAL_SYSTEMINTEGRATION); #ifdef WNT - Styles = (HIDDEN_ROOT,SYSTEMMODULE); + Styles = (HIDDEN_ROOT); #else Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL); #endif |