[ooo-build-commit] .: 2 commits - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                                    |   12 --------
 patches/dev300/ooo-build-resources-sc-sc-hrc.diff       |   23 ----------------
 patches/dev300/ooo-build-resources-svx-dialogs-hrc.diff |   22 ---------------
 3 files changed, 1 insertion(+), 56 deletions(-)

New commits:
commit c096c72f88f273d5ef94820cf677ff36cfaa75f9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 16 12:43:05 2010 +0200

    ooo-build-resources-sc-sc-hrc.diff: Migrated to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 849f284..18490d8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../po
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0
 
 # -------- Functional sub-sets --------
-Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
+Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
@@ -161,14 +161,6 @@ OOo4Kids: OOo4KidsPatches
 
 # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
 
-[ PreprocessPatches ]
-# Collection of patches that must be applied before all the other patches.
-
-# Create a safe hash number interval for ooo-build only resources.
-
-# hmm, already in git?
-# ooo-build-resources-sc-sc-hrc.diff, kohei
-
 [ HelpContent ]
 helpcontent-scalc-01.diff, kohei
 
diff --git a/patches/dev300/ooo-build-resources-sc-sc-hrc.diff b/patches/dev300/ooo-build-resources-sc-sc-hrc.diff
deleted file mode 100644
index 4471179..0000000
--- a/patches/dev300/ooo-build-resources-sc-sc-hrc.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- sc/inc/sc.hrc |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 6141ba2..2c7afaa 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1646,6 +1646,11 @@
- #define MID_3   3
- #define MID_4   4
- 
-+// ----------------------------------------------------------------------------
-+// ooo-build specific resources
-+
-+#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
-+
- #endif
- 
- 
--- 
-1.7.0.1
-
commit abe5a479b987bf85ff07fe35754f753b9f4749da
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 16 12:35:21 2010 +0200

    ooo-build-resources-svx-dialogs-hrc.diff: Migrated to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c5e31f7..849f284 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -169,8 +169,6 @@ OOo4Kids: OOo4KidsPatches
 # hmm, already in git?
 # ooo-build-resources-sc-sc-hrc.diff, kohei
 
-ooo-build-resources-svx-dialogs-hrc.diff, kohei
-
 [ HelpContent ]
 helpcontent-scalc-01.diff, kohei
 
diff --git a/patches/dev300/ooo-build-resources-svx-dialogs-hrc.diff b/patches/dev300/ooo-build-resources-svx-dialogs-hrc.diff
deleted file mode 100644
index 4cdc860..0000000
--- a/patches/dev300/ooo-build-resources-svx-dialogs-hrc.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- svx/inc/svx/dialogs.hrc |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
-index eb304d0..eb1d9c5 100755
---- svx/inc/svx/dialogs.hrc
-+++ svx/inc/svx/dialogs.hrc
-@@ -1051,5 +1051,10 @@
- #define OFA_TP_TABPROPERTIES_TEXT	    (RID_OFA_START + 245)
- #define OFA_TP_HELPERPROG               (RID_OFA_START + 249)
- 
-+// ----------------------------------------------------------------------------
-+// ooo-build specific resources
-+
-+#define SVX_OOO_BUILD_START             (RID_SVX_START + 1200)
-+
- #endif
- 
--- 
-1.7.0.1
-