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

[tml svn gnome org]

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

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

	* patches/dev300/apply
	* patches/dev300/enhanced-form-userform-controls-m35.diff:
	Differentiate for m35 vs. m36 and later. Doesn't apply without
	errors to dev300-m36, so commented out.



Added:
   trunk/patches/vba/enhanced-form-userform-controls-m35.diff   (props changed)
      - copied unchanged from r14630, /trunk/patches/vba/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:52:29 2008
@@ -1523,7 +1523,7 @@
 mono-climaker-bridgetest.diff
 
 # FIXME 2008-11-26: easiest to skip all this...
-[ VBAObjects >= dev300-m35 ]
+[ VBAObjects ]
 SectionOwner => noelpwer
 
 
@@ -1601,14 +1601,23 @@
 vba-support-properties-inmodules.diff
 controls-with-images-in-document.diff, i#38215, noelpwer
 
-
 # import graphic for image control
-# FIXME 2008-11-26: causes compilation error in dev300-m35
 controls-with-images-import.diff, Fong
+
+[ VBAObjects < dev300-m36 ]
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-enhanced-form-userform-controls.diff, noelpwer
+enhanced-form-userform-controls-m35.diff, noelpwer
+
+[ VBAObjects >= dev300-m36 ]
+#use of form control models in userforms/dialogs, additionally
+#enables use of document embedded images in image control for
+#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
+# FIXME 2008-11-28: doesn't apply to dev300-m36
+#enhanced-form-userform-controls.diff, noelpwer
+
+[ VBAObjects ]
 # object module support... getting there
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )