ooo-build r14639 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 13:58:02 2008
New Revision: 14639
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14639&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Comment out also
	vba-compatible-mode-uno.diff for >= m36 as it depends on
	enhanced-form-userform-controls.diff.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 13:58:02 2008
@@ -1622,8 +1622,19 @@
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
 vba-userform.diff
+
+[ VBAObjects < dev300-m36 ]
 # uno interface for vba mode
 vba-compatible-mode-uno.diff, Fong
+
+[ VBAObjects >= dev300-m36 ]
+# uno interface for vba mode
+# FIXME 2008-11-28: depends on enhanced-form-userform-controls.diff.
+# When that is uncommented, this section can be removed and this diff
+# unconditional, presumably
+#vba-compatible-mode-uno.diff, Fong
+
+[ VBAObjects ]
 # support to display spinbutton in userform
 vba-spinbutton-in-userform.diff, Fong