mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS scriptingf6 (1.5.2); FILE MERGED

Browse Source 
2004/09/30 09:34:18 dfoster 1.5.2.3: #i33478#
Add BrowseNode service.
2004/09/16 14:26:46 dfoster 1.5.2.2: #i33670#
Rename the context variable to XSCRIPTCONTEXT
2004/08/03 14:44:56 dfoster 1.5.2.1: #i32502#
This commit is contained in:
Rüdiger Timm
2004-10-22 13:49:31 +00:00
parent ccf6cac6a9
commit c1d4b34a7f
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ScriptProviderForBeanShell.java,v $ * $RCSfile: ScriptProviderForBeanShell.java,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: hr $ $Date: 2004-10-11 13:30:39 $ * last change: $Author: rt $ $Date: 2004-10-22 14:49:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -96,13 +96,13 @@ import java.net.URLDecoder;
import bsh.BshClassManager; import bsh.BshClassManager;
import bsh.Interpreter; import bsh.Interpreter;
import drafts.com.sun.star.script.provider.XScriptContext; import com.sun.star.script.provider.XScriptContext;
import drafts.com.sun.star.script.provider.XScriptProvider; import com.sun.star.script.provider.XScriptProvider;
import drafts.com.sun.star.script.provider.XScript; import com.sun.star.script.provider.XScript;
import drafts.com.sun.star.script.provider.ScriptErrorRaisedException; import com.sun.star.script.provider.ScriptErrorRaisedException;
import drafts.com.sun.star.script.provider.ScriptExceptionRaisedException; import com.sun.star.script.provider.ScriptExceptionRaisedException;
import drafts.com.sun.star.script.provider.ScriptFrameworkErrorException; import com.sun.star.script.provider.ScriptFrameworkErrorException;
import drafts.com.sun.star.script.provider.ScriptFrameworkErrorType; import com.sun.star.script.provider.ScriptFrameworkErrorType;
import com.sun.star.script.framework.provider.*; import com.sun.star.script.framework.provider.*;
@@ -171,7 +171,7 @@ public class ScriptProviderForBeanShell
{ {
xSingleServiceFactory = FactoryHelper.getServiceFactory( xSingleServiceFactory = FactoryHelper.getServiceFactory(
ScriptProviderForBeanShell._ScriptProviderForBeanShell.class, ScriptProviderForBeanShell._ScriptProviderForBeanShell.class,
"drafts.com.sun.star.script.ScriptProviderForBeanShell", "com.sun.star.script.ScriptProviderForBeanShell",
multiFactory, multiFactory,
regKey ); regKey );
} }
@@ -194,16 +194,19 @@ public class ScriptProviderForBeanShell
String impl = "com.sun.star.script.framework.provider.beanshell." + String impl = "com.sun.star.script.framework.provider.beanshell." +
"ScriptProviderForBeanShell$_ScriptProviderForBeanShell"; "ScriptProviderForBeanShell$_ScriptProviderForBeanShell";
String service1 = "drafts.com.sun.star.script.provider." + String service1 = "com.sun.star.script.provider." +
"ScriptProvider"; "ScriptProvider";
String service2 = "drafts.com.sun.star.script.provider." + String service2 = "com.sun.star.script.provider." +
"LanguageScriptProvider"; "LanguageScriptProvider";
String service3 = "drafts.com.sun.star.script.provider." + String service3 = "com.sun.star.script.provider." +
"ScriptProviderForBeanShell"; "ScriptProviderForBeanShell";
String service4 = "com.sun.star.script.browse." +
"BrowseNode";
if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) ) FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
{ {
return true; return true;
} }
@@ -311,7 +314,7 @@ class ScriptImpl implements XScript
// for source file ( bla.java ) on import or reference // for source file ( bla.java ) on import or reference
interpreter.setClassLoader(cl); interpreter.setClassLoader(cl);
try { try {
interpreter.set("context", interpreter.set("XSCRIPTCONTEXT",
ScriptContext.createContext(m_xModel, ScriptContext.createContext(m_xModel,
m_xContext, m_xMultiComponentFactory)); m_xContext, m_xMultiComponentFactory));