diff options
author | Noel Power <npower@openoffice.org> | 2003-01-28 10:52:17 +0000 |
---|---|---|
committer | Noel Power <npower@openoffice.org> | 2003-01-28 10:52:17 +0000 |
commit | 870638f3a5db7ccecd5a5338b59bcbb9d130e63c (patch) | |
tree | 5ee1f20a72d28510344ceedcec9d0c781d8094b0 /scripting/source/runtimemgr | |
parent | 80965be16be2edd8a1c717df9b27d9b3b22927a4 (diff) |
Changes to reflect api change (in XScriptNameResolver.idl, method resolve now returns a XScriptInfo)
Diffstat (limited to 'scripting/source/runtimemgr')
4 files changed, 19 insertions, 18 deletions
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index 8376ead1b5f3..99c9241a641f 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptNameResolverImpl.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dfoster $ $Date: 2003-01-27 17:18:27 $ + * last change: $Author: npower $ $Date: 2003-01-28 11:52:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,12 +132,12 @@ ScriptNameResolverImpl::~ScriptNameResolverImpl() } //************************************************************************* -Reference< XInterface > ScriptNameResolverImpl::resolve( +Reference< storage::XScriptInfo > ScriptNameResolverImpl::resolve( const ::rtl::OUString & scriptURI, Any& invocationCtx ) throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException ) { - Reference< XInterface > resolvedName; + Reference< storage::XScriptInfo > resolvedName; Reference< beans::XPropertySet > xPropSetScriptingContext; scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = scripting_constants::ScriptingConstantsPool::instance(); @@ -301,12 +301,12 @@ throw( RuntimeException ) //************************************************************************* -Reference< XInterface > +Reference< storage::XScriptInfo > ScriptNameResolverImpl::resolveURIFromStorageID ( sal_Int32 sid, const ::rtl::OUString& scriptURI ) SAL_THROW ( ( lang::IllegalArgumentException, RuntimeException ) ) { - Reference< XInterface > resolvedScriptInfo; + Reference< storage::XScriptInfo > resolvedScriptInfo; scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = scripting_constants::ScriptingConstantsPool::instance(); if ( sid == scriptingConstantsPool.DOC_STORAGE_ID_NOT_SET ) diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx index a7ae36da3d38..2c0e65fea640 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptNameResolverImpl.hxx,v $ * -* $Revision: 1.8 $ +* $Revision: 1.9 $ * -* last change: $Author: dfoster $ $Date: 2002-11-06 16:26:31 $ +* last change: $Author: npower $ $Date: 2003-01-28 11:52:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,7 @@ #include <drafts/com/sun/star/script/framework/XScriptNameResolver.hpp> #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp> +#include <drafts/com/sun/star/script/framework/storage/XScriptInfo.hpp> namespace scripting_runtimemgr { @@ -112,13 +113,13 @@ public: @exception NullPointerException @return the resolved XScriptURI */ - css::uno::Reference < css::uno::XInterface > SAL_CALL resolve( + css::uno::Reference < dcsssf::storage::XScriptInfo > SAL_CALL resolve( const ::rtl::OUString & scriptURI, css::uno::Any& invocationCtx ) throw( css::script::CannotConvertException, css::lang::IllegalArgumentException, css::uno::RuntimeException ); private: - css::uno::Reference < css::uno::XInterface > + css::uno::Reference < dcsssf::storage::XScriptInfo > resolveURIFromStorageID( sal_Int32 sid, const ::rtl::OUString & nameToResolve ) SAL_THROW ( ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) ); diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index c628bd59a50d..3755e21f2d12 100755 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptRuntimeManager.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dfoster $ $Date: 2003-01-27 17:18:27 $ + * last change: $Author: npower $ $Date: 2003-01-28 11:52:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -211,7 +211,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke( try { - Reference< XInterface > resolvedScript = resolve( scriptURI, + Reference< storage::XScriptInfo > resolvedScript = resolve( scriptURI, resolvedCtx ); validateXRef( resolvedScript, "ScriptRuntimeManager::invoke: No resolvedURI" ); @@ -326,13 +326,13 @@ Any SAL_CALL ScriptRuntimeManager::invoke( //************************************************************************* // XScriptNameResolver implementation -Reference< XInterface > SAL_CALL +Reference< storage::XScriptInfo > SAL_CALL ScriptRuntimeManager::resolve( const ::rtl::OUString& scriptURI, Any& invocationCtx ) throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException ) { OSL_TRACE( "** ==> ScriptRuntimeManager in resolve\n" ); - Reference< XInterface > resolvedURI; + Reference< storage::XScriptInfo > resolvedURI; Reference< XScriptNameResolver > xScriptNameResolver = getScriptNameResolver(); validateXRef( xScriptNameResolver, diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx index c03d4b0bf15f..534897a8be67 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptRuntimeManager.hxx,v $ * -* $Revision: 1.7 $ +* $Revision: 1.8 $ * -* last change: $Author: dfoster $ $Date: 2002-11-06 16:26:31 $ +* last change: $Author: npower $ $Date: 2003-01-28 11:52:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,7 @@ public: same as the documentStorageID. * @return the resolved URI */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL resolve( + virtual css::uno::Reference< dcsssf::storage::XScriptInfo > SAL_CALL resolve( const ::rtl::OUString& scriptUri, css::uno::Any& invocationCtx ) throw( css::lang::IllegalArgumentException, css::script::CannotConvertException, |