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

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Mar 19 16:49:40 2009
New Revision: 15580
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15580&view=rev

Log:
2009-03-19  Noel Power  <noel power novell com>

        * patches/dev300/apply: add fix for n#485467
        * patches/vba/vba-fix-named-any-para-pass.diff:



Added:
   trunk/patches/vba/vba-fix-named-any-para-pass.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 19 16:49:40 2009
@@ -1936,11 +1936,12 @@
 vba-commandbar-enabled.diff, n#459458, Fong
 # worksheet change event rework
 vba-worksheet-change-event-fix.diff, Fong
+
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao
 vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
-
+vba-fix-named-any-para-pass.diff, n#485467
 #must ask kendy about this ( noelp )
 vba-parallel-build.diff, #no-upstream
 #not so useful but perhaps we can build on it later

Added: trunk/patches/vba/vba-fix-named-any-para-pass.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-named-any-para-pass.diff	Thu Mar 19 16:49:40 2009
@@ -0,0 +1,20 @@
+diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
+index 7997feb..1b28f61 100644
+--- basic/source/runtime/step1.cxx
++++ basic/source/runtime/step1.cxx
+@@ -94,6 +94,15 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
+ 	{
+ 		String aAlias( pImg->GetString( static_cast<short>( nOp1 ) ) );
+ 		SbxVariableRef pVal = PopVar();
++		if( pVal->ISA(SbxMethod) || pVal->ISA(SbUnoProperty) || pVal->ISA(SbProcedureProperty) )
++		{
++			// named variables ( that are Any especially properties ) can be empty at this point and need a broadcast
++			if ( pVal->GetType() == SbxEMPTY )
++				pVal->Broadcast( SBX_HINT_DATAWANTED );
++			// Methoden und Properties evaluieren!
++			SbxVariable* pRes = new SbxVariable( *pVal );
++			pVal = pRes;
++		}
+ 		refArgv->Put( pVal, nArgc );
+ 		refArgv->PutAlias( aAlias, nArgc++ );
+ 	}