#i17307#

XFunction->XScript etc

4 files changed, 308 insertions, 8 deletions

diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
new file mode 100644
index 000000000000..a6a00ad2e3b1
--- /dev/null
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -0,0 +1,153 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ScriptImpl.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dfoster $ $Date: 2003-07-23 13:58:46 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include <stdio.h>
+
+#include "ScriptImpl.hxx"
+#include <util/util.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::drafts::com::sun::star::script::framework;
+
+namespace func_provider
+{
+
+//*************************************************************************
+ScriptImpl::ScriptImpl(
+    const Reference< beans::XPropertySet > & scriptingContext,
+    const Reference< runtime::XScriptInvocation > & runtimeMgr,
+    const ::rtl::OUString& scriptURI )
+throw ( RuntimeException ) :
+        m_XScriptingContext( scriptingContext ),
+        m_RunTimeManager( runtimeMgr ),
+        m_ScriptURI( scriptURI )
+{
+    OSL_TRACE( "<!constucting a ScriptImpl>\n" );
+    validateXRef( m_XScriptingContext,
+                  "ScriptImpl::ScriptImpl: No XScriptingContext\n" );
+    validateXRef( m_RunTimeManager,
+                  "ScriptImpl::ScriptImpl: No XScriptInvocation\n" );
+}
+
+//*************************************************************************
+ScriptImpl::~ScriptImpl()
+{
+    OSL_TRACE( "<Destructing a ScriptImpl>\n" );
+}
+
+//*************************************************************************
+Any SAL_CALL
+ScriptImpl::invoke( const Sequence< Any >& aParams,
+                      Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
+throw ( lang::IllegalArgumentException, script::CannotConvertException,
+        reflection::InvocationTargetException, RuntimeException )
+{
+    OSL_TRACE( "<ScriptImpl::invoke>" );
+    Any result;
+    Any anyScriptingContext;
+
+    anyScriptingContext <<= m_XScriptingContext;
+    try
+    {
+        result = m_RunTimeManager->invoke( m_ScriptURI, anyScriptingContext, aParams,
+                                           aOutParamIndex, aOutParam );
+    }
+    catch ( lang::IllegalArgumentException & iae )
+    {
+        ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke IllegalArgumentException : " );
+        throw lang::IllegalArgumentException( temp.concat( iae.Message ),
+                                              Reference< XInterface > (),
+                                              iae.ArgumentPosition );
+    }
+    catch ( script::CannotConvertException & cce )
+    {
+        ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke CannotConvertException : " );
+        throw script::CannotConvertException( temp.concat( cce.Message ),
+                                              Reference< XInterface > (),
+                                              cce.DestinationTypeClass,
+                                              cce.Reason,
+                                              cce.ArgumentIndex );
+    }
+    catch ( reflection::InvocationTargetException & ite )
+    {
+        ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke InvocationTargetException : " );
+        throw reflection::InvocationTargetException( temp.concat( ite.Message ),
+                Reference< XInterface > (),
+                ite.TargetException );
+    }
+    catch ( RuntimeException & re )
+    {
+        ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke RuntimeException : " );
+        throw RuntimeException( temp.concat( re.Message ),
+                                Reference< XInterface > () );
+    }
+#ifdef _DEBUG
+    catch ( ... )
+    {
+        throw RuntimeException(
+            OUSTR( "ScriptImpl::invoke Unknown Exception caught - RuntimeException rethrown" ),
+            Reference< XInterface > () );
+    }
+#endif
+    return result;
+}
+} // namespace func_provider
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
new file mode 100644
index 000000000000..791b882cfdb8
--- /dev/null
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -0,0 +1,147 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ScriptImpl.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dfoster $ $Date: 2003-07-23 13:58:46 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _FRAMEWORK_SCRIPT_PROVIDER_FUNCTIONIMPL_HXX_
+#define  _FRAMEWORK_SCRIPT_PROVIDER_FUNCTIONIMPL_HXX_
+
+#include <cppuhelper/implbase1.hxx> // helper for XInterface, XTypeProvider etc.
+#include <osl/mutex.hxx>
+
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/script/CannotConvertException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/reflection/InvocationTargetException.hpp>
+
+#include <drafts/com/sun/star/script/framework/provider/XScript.hpp>
+#include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
+
+namespace func_provider
+{
+// for simplification
+#define css ::com::sun::star
+#define dcsssf ::drafts::com::sun::star::script::framework
+
+
+class ScriptImpl :
+            public ::cppu::WeakImplHelper1 < dcsssf::provider::XScript >
+{
+
+public:
+    /*************************************************************
+      ScriptImpl Constructor
+      @param runtimeMgr which is a service that implement a XScriptInvocation
+      @param scriptURI the received ScriptURI that needs to be resolve and invoked
+    */
+    ScriptImpl(
+        const css::uno::Reference< css::beans::XPropertySet > & scriptingContext,
+        const css::uno::Reference< dcsssf::runtime::XScriptInvocation > & runtimeMgr,
+        const ::rtl::OUString& scriptURI )
+    throw ( css::uno::RuntimeException );
+
+    /*************************************************************
+      ScriptImpl Destructor
+    */
+    ~ScriptImpl();
+
+    /*************************************************************
+      Invoke
+      @param aParams all parameters; pure, out params are undefined in sequence,
+        i.e., the value has to be ignored by the callee
+      @param aOutParamIndex out indices
+      @param aOutParam out parameters
+
+      @returns
+            the value returned from the function being invoked
+
+      @throws IllegalArgumentException
+            if there is no matching script name
+
+      @throws CannotConvertException
+            if args do not match or cannot be converted the those
+            of the invokee
+
+      @throws InvocationTargetException
+            if the running script throws an exception this information is captured and
+            rethrown as this exception type.
+
+    */
+    virtual css::uno::Any SAL_CALL invoke(
+        const css::uno::Sequence< css::uno::Any > & aParams,
+        css::uno::Sequence< sal_Int16 > & aOutParamIndex,
+        css::uno::Sequence< css::uno::Any > & aOutParam )
+    throw ( css::lang::IllegalArgumentException,
+            css::script::CannotConvertException,
+            css::reflection::InvocationTargetException,
+            css::uno::RuntimeException );
+
+private:
+    css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext;
+    css::uno::Reference < dcsssf::runtime::XScriptInvocation > m_RunTimeManager;
+    ::rtl::OUString m_ScriptURI;
+
+    /* copy ctor disabled, i.e. not defined */
+    ScriptImpl( const ScriptImpl& );
+    /* assignment disabled,  i.e. not defined */
+    ScriptImpl& operator = ( const ScriptImpl& );
+};
+} // namespace func_provider
+#endif //_FRAMEWORK_SCRIPT_PROVIDER_FUNCTIONIMPL_HXX_
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
index 01dd8aeb6ea4..670becc09b44 100644
--- a/scripting/source/provider/makefile.mk
+++ b/scripting/source/provider/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: npower $ $Date: 2003-07-07 14:23:51 $
+#   last change: $Author: dfoster $ $Date: 2003-07-23 13:58:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,8 +78,8 @@ COMP1TYPELIST=$(TARGET)
 
 SLOFILES=\
         $(SLO)$/ScriptingContext.obj\
-        $(SLO)$/FunctionImpl.obj\
-        $(SLO)$/FunctionProvider.obj\
+        $(SLO)$/ScriptImpl.obj\
+        $(SLO)$/ScriptProvider.obj\
 
 # --- Targets ------------------------------------------------------
 
diff --git a/scripting/source/provider/provider.xml b/scripting/source/provider/provider.xml
index 3f31b85d47fa..f42f8d821b3c 100755
--- a/scripting/source/provider/provider.xml
+++ b/scripting/source/provider/provider.xml
@@ -4,20 +4,20 @@
     <module-name>   ScriptRuntimeManager    </module-name>
     <component-description>
         <author> Noel Power</author>
-        <name>  drafts.com.sun.star.script.framework.provider.FunctionProvider  </name>
+        <name>  drafts.com.sun.star.script.framework.provider.ScriptProvider    </name>
         <description>
     This component is part of the Scripting Framework
 </description>
         <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
         <language>  c++ </language>
         <status value="drafts"/>
-        <supported-service> drafts.com.sun.star.script.framework.provider.FunctionProvider  </supported-service>
+        <supported-service> drafts.com.sun.star.script.framework.provider.ScriptProvider    </supported-service>
         <type>  com.sun.star.beans.XPropertySet                 </type>
         <type>  com.sun.star.uno.Exception                  </type>
         <type>  com.sun.star.io.IOException                 </type>
         <type>  com.sun.star.io.XStream                 </type>
-        <type>  drafts.com.sun.star.script.framework.provider.XFunction </type>
-        <type>  drafts.com.sun.star.script.framework.provider.XFunctionProvider </type>
+        <type>  drafts.com.sun.star.script.framework.provider.XScript </type>
+        <type>  drafts.com.sun.star.script.framework.provider.XScriptProvider </type>
         <type>  drafts.com.sun.star.script.framework.runtime.XScriptInvocation </type>
 
     </component-description>