ooo-build r14851 - in branches/ooo-build-3-0: . patches/dev300
- From: szalaik svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14851 - in branches/ooo-build-3-0: . patches/dev300
- Date: Mon, 15 Dec 2008 09:53:39 +0000 (UTC)
Author: szalaik
Date: Mon Dec 15 09:53:38 2008
New Revision: 14851
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14851&view=rev
Log:
2008-12-15 Kalman Szalai - KAMI <kamihir freemail hu>
* patches/dev300/scp2_accessories.diff: Accessories in OOOP
Better grouping of Accessories elements in Windows installer.
Modified:
branches/ooo-build-3-0/ChangeLog
branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
Modified: branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff Mon Dec 15 09:53:38 2008
@@ -1894,7 +1894,7 @@
diff -Naur scp2/source/accessories/module_samples_accessories.scp scp2/source/accessories/module_samples_accessories.scp
--- scp2/source/accessories/module_samples_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_samples_accessories.scp 2008-03-23 15:19:17.000000000 +0100
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1934,8 +1934,18 @@
+
+#ifndef WITHOUT_EXTRA_SAMPLE
+
-+Module gid_Module_Optional_Accessories_Samples_Template
++Module gid_Module_Optional_Accessories_Samples
++ PackageInfo = "packinfo_accessories.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
+ ParentID = gid_Module_Optional_Accessories;
++ Files = ();
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++
++Module gid_Module_Optional_Accessories_Samples_Template
++ ParentID = gid_Module_Optional_Accessories_Samples;
+ Name = "gid_Module_Optional_Accessories_Samples_Template";
+ Description = "gid_Module_Optional_Accessories_Samples_Template";
+ Styles = (TEMPLATEMODULE);
@@ -1946,8 +1956,18 @@
+ Default = YES;
+End
+
-+Module gid_Module_Optional_Accessories_Documentations_Template
++Module gid_Module_Optional_Accessories_Documentations
++ PackageInfo = "packinfo_accessories.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
+ ParentID = gid_Module_Optional_Accessories;
++ Files = ();
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++
++Module gid_Module_Optional_Accessories_Documentations_Template
++ ParentID = gid_Module_Optional_Accessories_Documentations;
+ Name = "gid_Module_Optional_Accessories_Documentations_Template";
+ Description = "gid_Module_Optional_Accessories_Documentations_Template";
+ Styles = (TEMPLATEMODULE);
@@ -1958,8 +1978,18 @@
+ Default = YES;
+End
+
-+Module gid_Module_Optional_Accessories_Advertisement_Template
++Module gid_Module_Optional_Accessories_Advertisement
++ PackageInfo = "packinfo_accessories.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
+ ParentID = gid_Module_Optional_Accessories;
++ Files = ();
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++
++Module gid_Module_Optional_Accessories_Advertisement_Template
++ ParentID = gid_Module_Optional_Accessories_Advertisement;
+ Name = "gid_Module_Optional_Accessories_Advertisement_Template";
+ Description = "gid_Module_Optional_Accessories_Advertisement_Template";
+ Styles = (TEMPLATEMODULE);
@@ -1972,6 +2002,7 @@
+
+#include "alllangmodules_accessories_samples.inc"
+#endif
++
diff -Naur scp2/source/accessories/module_samples_accessories.ulf scp2/source/accessories/module_samples_accessories.ulf
--- scp2/source/accessories/module_samples_accessories.ulf 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_samples_accessories.ulf 2008-03-22 15:20:30.000000000 +0100
@@ -2032,7 +2063,7 @@
diff -Naur scp2/source/accessories/module_templates_accessories.scp scp2/source/accessories/module_templates_accessories.scp
--- scp2/source/accessories/module_templates_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_templates_accessories.scp 2008-03-23 11:10:17.000000000 +0100
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -2072,8 +2103,18 @@
+
+#ifndef WITHOUT_EXTRA_TEMPLATE
+
-+Module gid_Module_Optional_Accessories_Templates_Template
++Module gid_Module_Optional_Accessories_Templates
++ PackageInfo = "packinfo_accessories.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
+ ParentID = gid_Module_Optional_Accessories;
++ Files = ();
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++
++Module gid_Module_Optional_Accessories_Templates_Template
++ ParentID = gid_Module_Optional_Accessories_Templates;
+ Name = "gid_Module_Optional_Accessories_Templates_Template";
+ Description = "gid_Module_Optional_Accessories_Templates_Template";
+ Styles = (TEMPLATEMODULE);
@@ -2108,7 +2149,7 @@
+ PackageInfo = "packinfo_accessories.txt";
+ ParentID = gid_Module_Optional_Accessories;
+ Name = "gid_Module_Optional_Accessories_Templates_Common";
-+ Description = "gid_Module_Optional_Accessories_Templates_Common";
++ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
+ Files = (
+ gid_File_Extra_Templates_Common,
+ gid_File_Extra_Templates_Common_Layout,
@@ -2128,6 +2169,7 @@
+
+#include "alllangmodules_accessories_templates.inc"
+#endif
++
diff -Naur scp2/source/accessories/module_templates_accessories.ulf scp2/source/accessories/module_templates_accessories.ulf
--- scp2/source/accessories/module_templates_accessories.ulf 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_templates_accessories.ulf 2008-03-22 15:20:50.000000000 +0100
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]