ooo-build r14830 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Fri Dec 12 08:37:57 2008
New Revision: 14830
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14830&view=rev

Log:
2008-12-12  Fong Lin  <pflin novell com>
	* patches/vba/vba-word-support.diff: Fixed for apply break.
	* patches/vba/store-install.diff.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/store-install.diff
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/dev300/store-install.diff
==============================================================================
--- trunk/patches/dev300/store-install.diff	(original)
+++ trunk/patches/dev300/store-install.diff	Fri Dec 12 08:37:57 2008
@@ -96,15 +96,6 @@
 # 
 # .IF "$(LOCALPYFILES)"!=""
 # .IF "$(PKGFORMAT)"==""
---- oovbaapi/util/makefile.mk	2007-07-05 12:07:16.000000000 +0100
-+++ oovbaapi-patched/util/makefile.mk	2007-07-05 12:43:12.000000000 +0100
-@@ -57,5 +57,5 @@ UNOIDLDBFILES= \
- 	$(UCR)$/constants.db
- 
- # --- Targets ------------------------------------------------------
--
-+REGMERGEFLAGS=-i
- .INCLUDE :  target.mk
 diff -rup udkapi-orig/util/makefile.mk udkapi/util/makefile.mk
 --- udkapi-orig/util/makefile.mk        2008-09-03 13:23:25.000000000 +0200
 +++ udkapi/util/makefile.mk     2008-09-03 13:21:01.000000000 +0200

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Fri Dec 12 08:37:57 2008
@@ -6099,7 +6099,7 @@
 -	$(UCR)$/constants.db
 -
 -# --- Targets ------------------------------------------------------
--REGMERGEFLAGS=-i
+-
 +TARGET_HELPER=vbahelper
 +SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
 +SHL1IMPLIB= i$(TARGET_HELPER)