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

Change implementation names of script providers...

Browse Source 
...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.
This commit is contained in:
Stephan Bergmann
2012-04-26 15:51:28 +02:00
parent 2ac2e013be
commit 03511802da
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/java/ScriptProviderForBeanShell.component
View File

@@ -28,7 +28,7 @@
<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell$_ScriptProviderForBeanShell">
<implementation name="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell$ScriptProviderForBeanShell_2">
<service name="com.sun.star.script.browse.BrowseNode"/>
<service name="com.sun.star.script.provider.LanguageScriptProvider"/>
<service name="com.sun.star.script.provider.ScriptProvider"/>

2
scripting/java/ScriptProviderForJavaScript.component
View File

@@ -28,7 +28,7 @@
<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript$_ScriptProviderForJavaScript">
<implementation name="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript$ScriptProviderForJavaScript_2">
<service name="com.sun.star.script.browse.BrowseNode"/>
<service name="com.sun.star.script.provider.LanguageScriptProvider"/>
<service name="com.sun.star.script.provider.ScriptProvider"/>

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

@@ -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 );

8
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
View File

@@ -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 );