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

[pflin svn gnome org]

Author: pflin
Date: Mon Aug  4 09:27:13 2008
New Revision: 13470
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13470&view=rev

Log:
2008-08-04  Fong Lin  <pflin novell com>
	* patches/dev300/cws-npower11.diff:fix build issue . 
	* patches/vba/vba-enable-vbaevents.diff: enable vba events
	in ooo-build.
	* patches/dev300/apply: apply the patch.



Added:
   trunk/patches/vba/vba-enable-vbaevents.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-npower11.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug  4 09:27:13 2008
@@ -1407,6 +1407,9 @@
 # core changes not yet upstream
 sc-source-ui-vba-makefile-mk.diff
 
+# enable vba events in ooo-build
+vba-enable-vbaevents.diff, Fong
+
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer
 

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Mon Aug  4 09:27:13 2008
@@ -894,7 +894,7 @@
                  $(SLO)$/vbaradiobutton.obj \
                  $(SLO)$/vbalistbox.obj \
                  $(SLO)$/vbapropvalue.obj \
-@@ -111,8 +112,30 @@ SLOFILES= \
+@@ -111,8 +112,25 @@ SLOFILES= \
                  $(SLO)$/vbaformatconditions.obj \
                  $(SLO)$/vbastyle.obj \
                  $(SLO)$/vbastyles.obj \
@@ -919,11 +919,6 @@
 +        		$(SLO)$/vbapagebreaks.obj \
 +		        $(SLO)$/vbaspinbutton.obj \
 +				$(SLO)$/service.obj
-+
-+#.IF "$(VBA_OOBUILD_HACK)" != ""
-+SLOFILES +=	\
-+			$(SLO)$/vbaeventshelper.obj
-+#.ENDIF
  
  # --- Targets ------------------------------------------------------
  

Added: trunk/patches/vba/vba-enable-vbaevents.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-enable-vbaevents.diff	Mon Aug  4 09:27:13 2008
@@ -0,0 +1,10 @@
+--- sc/source/ui/vba/makefile.mk.orig	2008-08-04 17:06:26.000000000 +0800
++++ sc/source/ui/vba/makefile.mk	2008-08-04 17:07:28.000000000 +0800
+@@ -130,6 +130,7 @@ SLOFILES= \
+ 		        $(SLO)$/vbapagebreak.obj \
+         		$(SLO)$/vbapagebreaks.obj \
+ 		        $(SLO)$/vbaspinbutton.obj \
++				$(SLO)$/vbaeventshelper.obj	\
+ 				$(SLO)$/service.obj
+ 
+ # --- Targets ------------------------------------------------------