diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-17 13:28:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-17 13:29:18 +0200 |
| commit | 2418bae7027706a0cc2a4132edc378f651bed0a1 (patch) | |
| tree | f0bea12ee78be3dd11c5124510471029f4b4163a | |
| parent | e4d1c22aa1a2c44e92543566f100a800b295f009 (diff) | |
Undo basis/brand split: move help/ from basis to brand.
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Paths.xcu | 3 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_help_template.scp | 2 |
5 files changed, 4 insertions, 22 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index bb0af9be40cf..1bf90f2a303f 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -126,8 +126,7 @@ <node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <!-- FIXME where should this go --> - <node oor:name="$(instpath)/basis-link/help" oor:op="fuse" /> + <node oor:name="$(instpath)/help" oor:op="fuse" /> </node> </node> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index bdd2edfd43fd..74e0c0f409fd 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1660,8 +1660,7 @@ <author>ABI</author> <desc>Specifies the path to the Office help files.</desc> </info> - <!-- FIXME where should this go --> - <value>$(instpath)/basis-link/help</value> + <value>$(instpath)/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string"> <info> diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index bffd5bcfb48b..e7925ba8b699 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -167,20 +167,6 @@ Directory gid_Brand_Dir_Readme DosName = "readmes"; End -Directory gid_Brand_Dir_Help -#if defined MACOSX - ParentID = gid_Dir_Bundle_Contents; -#else - ParentID = gid_Dir_Brand_Root; -#endif - DosName = "help"; -End - -Directory gid_Brand_Dir_Help_Isolanguage - ParentID = gid_Brand_Dir_Help; - DIR_ISOLANGUAGE_ALL_LANG; -End - Directory gid_Brand_Dir_Share #if defined MACOSX ParentID = gid_Dir_Bundle_Contents; diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index e9c3adea01ab..b505095076c7 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -1188,9 +1188,9 @@ End Directory gid_Dir_Help #if defined MACOSX - ParentID = gid_Brand_Dir_BasisLink; + ParentID = gid_Dir_Bundle_Contents; #else - ParentID = gid_Dir_Ooo_Basis; + ParentID = gid_Dir_Brand_Root; #endif DosName = "help"; End diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp index 4022d59231ac..34a102e1eb81 100644 --- a/scp2/source/ooo/module_help_template.scp +++ b/scp2/source/ooo/module_help_template.scp @@ -39,8 +39,6 @@ Module gid_Module_Helppack_Help_Template gid_File_Help_Simpress_Zip, gid_File_Help_Smath_Zip, gid_File_Help_Swriter_Zip); - Dirs = (gid_Brand_Dir_Help, - gid_Brand_Dir_Help_Isolanguage); End #include "allhelpmodules_root.inc" |