ooo-build r14642 - trunk/patches/dev300

[tml svn gnome org]

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

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

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



Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 14:11:27 2008
@@ -1685,8 +1685,17 @@
 range-listBox-compare.diff, n#421939
 # fix bug comparing string that can't be converted to number
 stringnumbercompare.diff, n#422559
+
+[ VBAObjects < dev300-m36 ]
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak.diff
+
+[ VBAObjects >= dev300-m36 ]
+# fix import sizes and geometry of userforms
+# FIXME 2008-11-28
+#vba-userform-geometry-tweak.diff
+
+[ VBAObjects ]
 # n#426415
 vba-allow-forms-resetvalue-binding.diff
 # n#426415