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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun Aug  3 22:23:30 2008
New Revision: 13465
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13465&view=rev

Log:
also VBA

Removed:
   trunk/patches/vba/ObjectModule-m22.diff
   trunk/patches/vba/basic-caller-support-m22.diff
   trunk/patches/vba/vba-brackets-array-of-array.diff
   trunk/patches/vba/vba-dialogs-fixsmoketest.diff
   trunk/patches/vba/vba-userform-activate-fix-m22.diff
   trunk/patches/vba/vba-userform-m22.diff
   trunk/patches/vba/vba-workbook-worksheet-events.diff
   trunk/patches/vba/vbaevents-services-sources-m25.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Aug  3 22:23:30 2008
@@ -1385,12 +1385,6 @@
 #associating sheet and codename when insert a sheet
 # sc-insert-sheet-codename.diff, i#80869, jianhua
 
-# patch from Andreas Bregas
-[ VBAObjects < dev300-m22 >= beb300-m1 ]
-vba-brackets-array-of-array.diff, i#75443, noelpwer
-
-[ VBAObjects ]
-
 # NOT parameter without brackets
 vba-not-param-withoutbrackets.diff, n#397325, Fong
 
@@ -1457,40 +1451,14 @@
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
 vba-userform.diff
-# extracted from vcl92
-vba-userform-activate-fix.diff, i#91038
-
-[ VBAObjects < dev300-m22 >= beb300-m1 ]
-# object module support... getting there
-ObjectModule-m22.diff
-# userform ( depends on ObjectModule.diff )
-vba-userform-m22.diff
-# fix userform activate event re-compute
-vba-userform-activate-fix-m22.diff, Jianhua
+# fix userform activate event re-compute; extracted from vcl92
 vba-userform-activate-fix.diff, i#91038
 
-[ VBAObjects < dev300-m24 ]
-# another bug with event bindings for dialogs ( awaiting iz id from andreas )
-vba-dialogs-fixsmoketest.diff
-
-[ VBAObjects < dev300-m26 ]
-vbaevents-services-sources-m25.diff, i#68893
-[ VBAObjects >= dev300-m26 < beb300-m0 ]
 vbaevents-services-sources.diff, i#68893
 
-[ VBAObjects < dev300-m26 ]
-#merged into vba-workbook-worksheet-events-dev300.diff
-#vba-workbook-worksheet-events-buildfix.diff, 
-vba-workbook-worksheet-events.diff
-[ VBAObjects >= dev300-m23 < beb300-m0 ]
 # add support for passing a caller to basic when calling a script
 # via the scripting framework - note depends on vbaevents-services-sources.diff
 basic-caller-support.diff
-[ VBAObjects < dev300-m23 ]
-# add support for passing a caller to basic when calling a script
-# via the scripting framework - note depends on vbaevents-services-sources.diff
-basic-caller-support-m22.diff
-[ VBAObjects ]
 # comparison of tow empty type fix in vba mode
 vba-empty-comparison-fix.diff, n#397438, Fong
 # Add Worksheet.EnableSelection