[Libreoffice-commits] .: Branch 'integration/dev300_m98' - scp2/source

[Jan Holesovsky]

 scp2/source/gnome/file_gnome.scp         |   18 ------------
 scp2/source/ooo/module_help_template.scp |   46 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 18 deletions(-)

New commits:
commit 6878d9f4e5abaec7ffcd7d258c0b44cec5c6f0ba
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 4 18:20:20 2011 +0100

    Fix build in 'scp2' (missing file).

diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 3f39858..d489150 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -53,24 +53,6 @@ File gid_File_Share_Registry_Gnome_Xcd
 End
 #endif
 
-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-File gid_File_Share_Registry_Gnome_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "gnome.xcd";
-End
-#endif
-
-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-File gid_File_Share_Registry_Gnome_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "gnome.xcd";
-End
-#endif
-
 #ifdef ENABLE_GCONF
 File gid_File_Lib_Gconfbe
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
new file mode 100644
index 0000000..4022d59
--- /dev/null
+++ b/scp2/source/ooo/module_help_template.scp
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+Module gid_Module_Helppack_Help_Template
+    ParentID = gid_Module_Helppack_Helproot;
+    Name = "gid_Module_Helppack_Help_Template";
+    Description = "gid_Module_Helppack_Help_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (gid_File_Help_Common_Zip,
+             gid_File_Help_Sbasic_Zip,
+             gid_File_Help_Scalc_Zip,
+             gid_File_Help_Schart_Zip,
+             gid_File_Help_Sdatabase_Zip,
+             gid_File_Help_Sdraw_Zip,
+             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"