CWS-TOOLING: integrate CWS odbmacros3

5 files changed, 14 insertions, 16 deletions

diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 5c6d8a9d6192..85c8ecfe4393 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -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] );
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index c3059617ebf8..c9484f55a3fe 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -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 )
         {
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 871152167b87..00f6f1c7eb75 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -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 );
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index c63fcc0c861e..d36821ece7bd 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -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 ..." );
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 e70ebd7013f4..04b4a8e60990 100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -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 )
             {