diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-26 15:51:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-26 16:07:11 +0200 |
| commit | 03511802da45182d3fe85aa0eb7882298c586794 (patch) | |
| tree | 4a2854ecec6c3f856beb24c9f312a5f6de97260f /scripting/java/com/sun | |
| parent | 2ac2e013bef6c041c54879ad154089dc606051ee (diff) | |
Change implementation names of script providers...
...that are no longer bundled extensions. Otherwise, old user data where these
were still recorded as bundled extensions could cause execeptions at start up
about duplicate implementations.
Diffstat (limited to 'scripting/java/com/sun')
2 files changed, 8 insertions, 8 deletions
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index 5e3fb7e3ab8c..e41646cb042e 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -58,9 +58,9 @@ import com.sun.star.script.framework.container.ScriptMetaData; public class ScriptProviderForBeanShell { - public static class _ScriptProviderForBeanShell extends ScriptProvider + public static class ScriptProviderForBeanShell_2 extends ScriptProvider { - public _ScriptProviderForBeanShell(XComponentContext ctx) + public ScriptProviderForBeanShell_2(XComponentContext ctx) { super (ctx, "BeanShell"); } @@ -112,10 +112,10 @@ public class ScriptProviderForBeanShell { XSingleServiceFactory xSingleServiceFactory = null; - if ( implName.equals( ScriptProviderForBeanShell._ScriptProviderForBeanShell.class.getName() ) ) + if ( implName.equals( ScriptProviderForBeanShell.ScriptProviderForBeanShell_2.class.getName() ) ) { xSingleServiceFactory = FactoryHelper.getServiceFactory( - ScriptProviderForBeanShell._ScriptProviderForBeanShell.class, + ScriptProviderForBeanShell.ScriptProviderForBeanShell_2.class, "com.sun.star.script.provider.ScriptProviderForBeanShell", multiFactory, regKey ); diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index 39205d480808..aea209c0baf3 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -59,9 +59,9 @@ import org.mozilla.javascript.JavaScriptException; public class ScriptProviderForJavaScript { - public static class _ScriptProviderForJavaScript extends ScriptProvider + public static class ScriptProviderForJavaScript_2 extends ScriptProvider { - public _ScriptProviderForJavaScript(XComponentContext ctx) + public ScriptProviderForJavaScript_2(XComponentContext ctx) { super(ctx, "JavaScript"); } @@ -113,10 +113,10 @@ public class ScriptProviderForJavaScript { XSingleServiceFactory xSingleServiceFactory = null; - if ( implName.equals( ScriptProviderForJavaScript._ScriptProviderForJavaScript.class.getName() ) ) + if ( implName.equals( ScriptProviderForJavaScript.ScriptProviderForJavaScript_2.class.getName() ) ) { xSingleServiceFactory = FactoryHelper.getServiceFactory( - ScriptProviderForJavaScript._ScriptProviderForJavaScript.class, + ScriptProviderForJavaScript.ScriptProviderForJavaScript_2.class, "com.sun.star.script.provider.ScriptProviderForJavaScript", multiFactory, regKey ); |