ooo-build r14657 - in trunk/patches: dev300 vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Nov 28 15:08:39 2008
New Revision: 14657
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14657&view=rev

Log:
2008-11-28  Noel Power  <noel power novell com>

        * patches/dev300/apply: re-apply various patche that fail because
        the patch below was failing to apply for m36
        * patches/vba/enhanced-form-userform-controls.diff:




Modified:
   trunk/patches/dev300/apply
   trunk/patches/vba/enhanced-form-userform-controls.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 15:08:39 2008
@@ -1614,8 +1614,7 @@
 #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
+enhanced-form-userform-controls.diff, noelpwer
 
 [ VBAObjects ]
 # object module support... getting there
@@ -1623,29 +1622,12 @@
 # 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 < 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
-
 [ VBAObjects ]
 vbaevents-services-sources.diff, i#68893
 
@@ -1686,15 +1668,9 @@
 # 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

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Fri Nov 28 15:08:39 2008
@@ -300,7 +300,8 @@
 +		}
 +	if ( pFoundBasic )
 +		bDocDialog = pFoundBasic->IsDocBasic();
- 	Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pBasic, xModel );
+- 	Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pStartedBasic, xModel );
++       Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pINST->GetBasic(), xModel );
  
  	Sequence< Any > aArgs( 4 );
 -	aArgs[ 0 ] <<= xModel;