[Libreoffice-commits] .: officecfg/registry scp2/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Oct 17 04:29:33 PDT 2011
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 3 --
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 3 --
scp2/source/ooo/common_brand.scp | 14 -------------
scp2/source/ooo/directory_ooo.scp | 4 +--
scp2/source/ooo/module_help_template.scp | 2 -
5 files changed, 4 insertions(+), 22 deletions(-)
New commits:
commit 2418bae7027706a0cc2a4132edc378f651bed0a1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 17 13:28:54 2011 +0200
Undo basis/brand split: move help/ from basis to brand.
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index bb0af9b..1bf90f2 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 bdd2edf..74e0c0f 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 bffd5bc..e7925ba 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 e9c3ade..b505095 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 4022d59..34a102e 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"
More information about the Libreoffice-commits
mailing list