File vba-macro-properties-3.0.diff of Package OpenOffice_org-libs-core

diff --git build/ooo300-m9/scripting/source/vbaevents/eventhelper.cxx build/ooo300-m9/scripting/source/vbaevents/eventhelper.cxx
index 7e92951..f97aab4 100644
--- scripting/source/vbaevents/eventhelper.cxx
+++ scripting/source/vbaevents/eventhelper.cxx
@@ -806,18 +806,14 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
                     Sequence< Any > aOutArgs;
                     try
                     {
-                        uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
-                        if ( xScript.is() )
-                         {
-                            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
-                            if ( xProps.is() )
-                            {
-                                Sequence< Any > aCallerHack(1);
-                                aCallerHack[ 0 ] = uno::makeAny( rtl::OUString::createFromAscii("Error") );
-                                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
-                            }
-                            xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
-                         }
+                        if ( mpShell )
+                        {
+                            uno::Any aCaller;
+                            uno::Any aRet;
+                            aCaller <<=  rtl::OUString::createFromAscii("Error");
+                            mpShell->CallXScript( url,
+                                   aArguments, aRet, aOutArgsIndex, aOutArgs, false, &aCaller );
+                        }
                     }
                     catch ( uno::Exception& e )
                     {