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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 14:07:50 2008
New Revision: 14640
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14640&view=rev

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

	* patches/dev300/apply: Comment out also
	vba-spinbutton-in-userform.diff for >= m36.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 14:07:50 2008
@@ -1634,10 +1634,18 @@
 # unconditional, presumably
 #vba-compatible-mode-uno.diff, Fong
 
-[ VBAObjects ]
+[ VBAObjects < dev300-m36 ]
 # support to display spinbutton in userform
 vba-spinbutton-in-userform.diff, Fong
 
+[ VBAObjects >= dev300-m36 ]
+# support to display spinbutton in userform
+# FIXME 2008-11-28: doesn't apply to dev300-m36.
+# Whether that is just because required other diffs
+# are commented out or the upstream context 
+# has changed I don't know.
+#vba-spinbutton-in-userform.diff, Fong
+
 vbaevents-services-sources.diff, i#68893
 
 # vba workbook/worksheet events