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

CWS-TOOLING: integrate CWS odbmacros3

Browse Source
This commit is contained in:
Oliver Bolte
2008-10-16 06:57:26 +00:00
parent 7bf29c44ef
commit ae562e931a
23 changed files with 374 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripting/java/com/sun/star/script/framework/provider/PathUtils.java
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: PathUtils.java,v $
* $Revision: 1.8 $
* $Revision: 1.8.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -76,7 +76,7 @@ public class PathUtils {
{
try
{
Method getOid = IQueryInterface.class.getMethod("getOid", null);
Method getOid = IQueryInterface.class.getMethod("getOid", (java.lang.Class[])null);
if ( getOid != null )
{
oid = (String)getOid.invoke( xModel, new Object[0] );

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

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScriptProvider.java,v $
* $Revision: 1.13 $
* $Revision: 1.13.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -365,9 +365,8 @@ public abstract class ScriptProvider
ScriptMetaData scriptData = m_container.findScript( details );
if ( scriptData == null )
{
// TODO specify the correct error Type
throw new ScriptFrameworkErrorException( details.function + " does not exist",
null, details.function, language, ScriptFrameworkErrorType.UNKNOWN );
null, details.function, language, ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
}
return scriptData;
}
@@ -379,9 +378,8 @@ public abstract class ScriptProvider
}
catch ( com.sun.star.container.NoSuchElementException nse )
{
// TODO specify the correct error Type
throw new ScriptFrameworkErrorException( nse.getMessage(),
null, details.function, language, ScriptFrameworkErrorType.UNKNOWN );
null, details.function, language, ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
}
catch ( com.sun.star.lang.WrappedTargetException wta )
{

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

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScriptProviderForBeanShell.java,v $
* $Revision: 1.11 $
* $Revision: 1.11.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -244,7 +244,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
mfu.getMessage(), null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.MALFORMED_URL );
}
catch ( NoSuitableClassLoaderException nsc )
{
@@ -307,7 +307,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
"Failed to read script", null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
}
result = interpreter.eval( source );

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

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScriptProviderForJava.java,v $
* $Revision: 1.10 $
* $Revision: 1.10.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -253,7 +253,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
mfe.getMessage(), null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.MALFORMED_URL );
}
catch (NoSuitableClassLoaderException ncl )
{
@@ -323,7 +323,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
e.getMessage(), null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
}
}
catch ( ClassNotFoundException e )
@@ -332,7 +332,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
e.getMessage(), null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
}
LogUtils.DEBUG( "Starting Invoke on Proxy ..." );

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

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScriptProviderForJavaScript.java,v $
* $Revision: 1.10 $
* $Revision: 1.10.6.1 $
*
* This file is part of OpenOffice.org.
*
@@ -260,7 +260,7 @@ class ScriptImpl implements XScript
throw new ScriptFrameworkErrorException(
mfu.getMessage(), null,
metaData.getLanguageName(), metaData.getLanguage(),
ScriptFrameworkErrorType.UNKNOWN );
ScriptFrameworkErrorType.MALFORMED_URL );
}
catch ( com.sun.star.script.framework.provider.NoSuitableClassLoaderException nsc )
{