diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-27 10:23:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-27 10:27:02 +0200 |
| commit | 977506ef8f19e9c2c719547537872df64f8c56d3 (patch) | |
| tree | e10c0943d92397478d2aed4b2175d20e8f16c3c3 /scp2 | |
| parent | 9d9f9939bd1bd0f599f4461c30b6433aa92cb101 (diff) | |
Undo basis/brand split: removed obsoleted basis directories.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 27 | ||||
| -rw-r--r-- | scp2/source/ooo/ure_into_ooo.scp | 2 |
2 files changed, 1 insertions, 28 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 9ee91e989f20..8c52897d29e0 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -69,33 +69,6 @@ Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents End #endif -#ifndef MACOSX -Directory gid_Dir_Ooo_Openofficeorg - ParentID = PREDEFINED_PROGDIR; - #ifdef WNT - HostName = "${BASISROOTNAME}"; - #else - HostName = "."; - #endif -End -#endif - -#ifndef MACOSX -Directory gid_Dir_Ooo_Basis - #ifdef WNT - ParentID = gid_Dir_Brand_Root; - #else - ParentID = gid_Dir_Ooo_Openofficeorg; - #endif - #ifdef WNT - HostName = "Basis"; - #else - HostName = "basis${OOOBASEVERSION}"; - #endif - Styles = (BASISDIRECTORY, CREATE); -End -#endif - #if defined MACOSX Unixlink gid_Unixlink_Applications BIN_FILE_BODY; diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp index a67a50807001..c2dd9bc2329e 100644 --- a/scp2/source/ooo/ure_into_ooo.scp +++ b/scp2/source/ooo/ure_into_ooo.scp @@ -32,7 +32,7 @@ Directory gid_Dir_Common_Ure #ifdef WNT ParentID = gid_Dir_Brand_Root; #else - ParentID = gid_Dir_Ooo_Openofficeorg; + ParentID = PREDEFINED_PROGDIR; #endif #ifdef WNT HostName = "URE"; |