Kaydet (Commit) 2418bae7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Undo basis/brand split: move help/ from basis to brand.

üst e4d1c22a
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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
......
......@@ -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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment