Skip to content

C
core
Kaydet (Commit) 226f5484 authored tarafından Noel Power's avatar Noel Power
Dosyalara gözat
Seçenekler

Supporting changes for new runtime namespace

üst c39c04c2
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
scripting/source/provider/provider.xml
Dosyayı görüntüle @ 226f5484
......@@ -18,7 +18,7 @@
<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.XScriptInvocation </type>
<type> drafts.com.sun.star.script.framework.runtime.XScriptInvocation </type>
</component-description>
<project-build-dependency> cppuhelper </project-build-dependency>
......
scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
Dosyayı görüntüle @ 226f5484
......@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptNameResolverImpl.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: dfoster $ $Date: 2003-01-28 17:09:25 $
* last change: $Author: npower $ $Date: 2003-03-03 18:39:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -70,7 +70,7 @@
#include <com/sun/star/script/CannotConvertException.hpp>
#include <com/sun/star/reflection/InvocationTargetException.hpp>
#include <drafts/com/sun/star/script/framework/XScriptNameResolver.hpp>
#include <drafts/com/sun/star/script/framework/runtime/XScriptNameResolver.hpp>
#include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp>
#include <drafts/com/sun/star/script/framework/storage/XScriptInfo.hpp>
......@@ -81,7 +81,7 @@ namespace scripting_runtimemgr
#define dcsssf ::drafts::com::sun::star::script::framework
class ScriptNameResolverImpl : public
::cppu::WeakImplHelper1 < dcsssf::XScriptNameResolver >
::cppu::WeakImplHelper1 < dcsssf::runtime::XScriptNameResolver >
{
public:
/**********************************************
......
scripting/source/runtimemgr/ScriptRuntimeManager.cxx
Dosyayı görüntüle @ 226f5484
......@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptRuntimeManager.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: toconnor $ $Date: 2003-02-20 12:17:55 $
* last change: $Author: npower $ $Date: 2003-03-03 18:39:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -86,9 +86,9 @@ namespace scripting_runtimemgr
{
static OUString s_implName = ::rtl::OUString::createFromAscii(
"drafts.com.sun.star.script.framework.ScriptRuntimeManager" );
"drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" );
static OUString s_serviceName = ::rtl::OUString::createFromAscii(
"drafts.com.sun.star.script.framework.ScriptRuntimeManager" );
"drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" );
static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
::rtl_StandardModuleCount s_moduleCount = MODULE_COUNT_INIT;
......@@ -120,13 +120,13 @@ ScriptRuntimeManager::~ScriptRuntimeManager()
//*************************************************************************
// Get the proper XScriptInvocation
Reference< XScriptInvocation > SAL_CALL ScriptRuntimeManager::getScriptRuntime(
Reference< runtime::XScriptInvocation > SAL_CALL ScriptRuntimeManager::getScriptRuntime(
const Reference< XInterface >& scriptInfo )
throw( RuntimeException )
{
OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime\n" );
Reference< XScriptInvocation > xScriptInvocation;
Reference< runtime::XScriptInvocation > xScriptInvocation;
try
{
......@@ -150,7 +150,7 @@ throw( RuntimeException )
validateXRef( xInterface,
"ScriptRuntimeManager::GetScriptRuntime: cannot get appropriate ScriptRuntime Service"
);
xScriptInvocation = Reference< XScriptInvocation >( xInterface, UNO_QUERY_THROW );
xScriptInvocation = Reference< runtime::XScriptInvocation >( xInterface, UNO_QUERY_THROW );
}
catch ( Exception & e )
{
......@@ -163,22 +163,22 @@ throw( RuntimeException )
//*************************************************************************
// Get the proper XScriptNameResolver
Reference< XScriptNameResolver > SAL_CALL
Reference< runtime::XScriptNameResolver > SAL_CALL
ScriptRuntimeManager::getScriptNameResolver()
throw( RuntimeException )
{
OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver\n" );
Reference< XScriptNameResolver > xScriptNameResolver;
Reference< runtime::XScriptNameResolver > xScriptNameResolver;
try
{
Reference< XInterface > xInterface = m_xMgr->createInstanceWithContext(
OUString::createFromAscii(
"drafts.com.sun.star.script.framework.DefaultScriptNameResolver" ),
"drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ),
m_xContext );
validateXRef( xInterface,
"ScriptRuntimeManager::GetScriptRuntime: cannot get instance of DefaultScriptNameResolver" );
xScriptNameResolver = Reference< XScriptNameResolver >( xInterface, UNO_QUERY_THROW );
xScriptNameResolver = Reference< runtime::XScriptNameResolver >( xInterface, UNO_QUERY_THROW );
}
catch ( Exception & e )
{
......@@ -257,7 +257,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
xPropSetResolvedCtx->setPropertyValue( scriptingConstantsPool.SCRIPT_INFO,
aResolvedScript );
Reference< XScriptInvocation > xScriptInvocation =
Reference< runtime::XScriptInvocation > xScriptInvocation =
getScriptRuntime( resolvedScript );
validateXRef( xScriptInvocation,
"ScriptRuntimeManager::invoke: cannot get instance of language specific runtime." );
......@@ -334,7 +334,7 @@ throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx
OSL_TRACE( "** ==> ScriptRuntimeManager in resolve\n" );
Reference< storage::XScriptInfo > resolvedURI;
Reference< XScriptNameResolver > xScriptNameResolver = getScriptNameResolver();
Reference< runtime::XScriptNameResolver > xScriptNameResolver = getScriptNameResolver();
validateXRef( xScriptNameResolver,
"ScriptRuntimeManager::resolve: No ScriptNameResolver" );
......@@ -491,8 +491,8 @@ extern "C"
Reference< registry::XRegistryKey > xKey(
pKey->createKey(
OUSTR("drafts.com.sun.star.script.framework.ScriptRuntimeManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.theScriptRuntimeManager")));
xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.ScriptRuntimeManager") );
OUSTR("drafts.com.sun.star.script.framework.ScriptRuntimeManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeManager")));
xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager") );
return sal_True;
}
......
scripting/source/runtimemgr/ScriptRuntimeManager.hxx
Dosyayı görüntüle @ 226f5484
......@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptRuntimeManager.hxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: npower $ $Date: 2003-01-28 11:52:17 $
* last change: $Author: npower $ $Date: 2003-03-03 18:39:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -74,8 +74,8 @@
#include <com/sun/star/script/CannotConvertException.hpp>
#include <com/sun/star/reflection/InvocationTargetException.hpp>
#include <drafts/com/sun/star/script/framework/XScriptInvocation.hpp>
#include <drafts/com/sun/star/script/framework/XScriptNameResolver.hpp>
#include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
#include <drafts/com/sun/star/script/framework/runtime/XScriptNameResolver.hpp>
namespace scripting_runtimemgr
{
......@@ -87,8 +87,8 @@ namespace scripting_runtimemgr
* Class responsible for managing the various ScriptRuntime implementations.
*/
class ScriptRuntimeManager : public
::cppu::WeakImplHelper3< dcsssf::XScriptInvocation, css::lang::XServiceInfo,
dcsssf::XScriptNameResolver >
::cppu::WeakImplHelper3< dcsssf::runtime::XScriptInvocation, css::lang::XServiceInfo,
dcsssf::runtime::XScriptNameResolver >
{
public:
explicit ScriptRuntimeManager(
......@@ -168,10 +168,10 @@ public:
css::uno::RuntimeException );
private:
css::uno::Reference< dcsssf::XScriptInvocation > SAL_CALL getScriptRuntime(
css::uno::Reference< dcsssf::runtime::XScriptInvocation > SAL_CALL getScriptRuntime(
const css::uno::Reference< css::uno::XInterface > & scriptInfo )
throw( css::uno::RuntimeException );
css::uno::Reference< dcsssf::XScriptNameResolver > SAL_CALL getScriptNameResolver()
css::uno::Reference< dcsssf::runtime::XScriptNameResolver > SAL_CALL getScriptNameResolver()
throw( css::uno::RuntimeException );
css::uno::Reference< css::uno::XComponentContext > m_xContext;
......
scripting/source/runtimemgr/runtimemgr.xml
Dosyayı görüntüle @ 226f5484
......@@ -32,8 +32,8 @@
<type> com.sun.star.io.XOutputStream </type>
<type> drafts.com.sun.star.script.framework.storage.XScriptInfoAccess </type>
<type> drafts.com.sun.star.script.framework.storage.XScriptStorageManager </type>
<type> drafts.com.sun.star.script.framework.XScriptInvocation </type>
<type> drafts.com.sun.star.script.framework.XScriptNameResolver </type>
<type> drafts.com.sun.star.script.framework.runtime.XScriptInvocation </type>
<type> drafts.com.sun.star.script.framework.runtime.XScriptNameResolver </type>
</component-description>
<project-build-dependency> cppuhelper </project-build-dependency>
<project-build-dependency> cppu </project-build-dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment