Updates to event processing for reading from events in doc bug #15552

1 files changed, 8 insertions, 7 deletions

diff --git a/scripting/workben/bindings/ScriptBinding.xba b/scripting/workben/bindings/ScriptBinding.xba
index 78c6557d456b..49adbfe4e109 100644
--- a/scripting/workben/bindings/ScriptBinding.xba
+++ b/scripting/workben/bindings/ScriptBinding.xba
@@ -597,15 +597,16 @@ sub evaluateForEvent( xmlline as string, lineCount as integer )
 	next n	
 end sub
 
-function isOKscriptProps( eventName as string ) 
+
+function isOKscriptProps( props() as Object, eventName as string ) as Boolean
 	On Error Goto ErrorHandler
-	scriptProps = ThisComponent.getEvents().getByName( eventName )
-	test = ubound( scriptProps )
-	isOKscriptProps = true
+	props  = ThisComponent.getEvents().getByName( eventName )
+	test = ubound( props() )
+	isOKscriptProps() = true
 	exit function
 	
 	ErrorHandler:
-	isOKscriptProps = false
+	isOKscriptProps() = false
 end function
 
 sub ReadEventsFromDoc()
@@ -613,8 +614,8 @@ sub ReadEventsFromDoc()
 	
 	eventSupplier = ThisComponent
 	for n = 0 to ubound( allEventTypes() )
-		scriptProps = eventSupplier.getEvents().getByName( allEventTypes( n ).Name )
-		if (isOKscriptProps(allEventTypes( n ).Name)) then
+		Dim scriptProps() as Object
+		if (isOKscriptProps( scriptProps(), allEventTypes( n ).Name) ) then
 			if ( ubound( scriptProps ) > 0 ) then
 				if ( scriptProps(0).Value = "Script" ) then
 					'Script binding