CWS-TOOLING: integrate CWS qadev40

10 files changed, 12 insertions, 20 deletions

diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java
index 3f5b00fde4e7..c49aa479ee38 100644
--- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java
@@ -93,9 +93,8 @@ public class _XOutputStream extends MultiMethodTest {
 
         XInputStream xInStream = checker.getInStream();
         byte[][] readData = new byte[1][data.length];
-        int iReadBytes = 0;
         try {
-            iReadBytes = xInStream.readBytes(readData, data.length);
+            xInStream.readBytes(readData, data.length);
         } catch(com.sun.star.io.IOException e) {
             log.println("Couldn't read data:" + e);
             res = false;
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
index 08d77ccc0ee3..b11659265441 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
@@ -78,7 +78,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
      * @see om.sun.star.sdb.XSingleSelectQueryAnalyzer
      * @see com.sun.star.beans.XPropertySet
      */
-    protected void before() throws Exception {
+    protected void before() /* throws Exception*/ {
 
         xQueryAna = (XSingleSelectQueryAnalyzer)
                       UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class,
@@ -100,7 +100,14 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
 
         }
 
-        colName = AnyConverter.toString(tEnv.getObjRelation("colName"));
+        try
+        {
+            colName = AnyConverter.toString(tEnv.getObjRelation("colName"));
+        }
+        catch (com.sun.star.lang.IllegalArgumentException e)
+        {
+            colName = null;
+        }
 
         if (colName == null) {
             throw new StatusException(Status.failed(
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
index 014152d79193..cbca4c600a4a 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
@@ -136,4 +136,4 @@ public class _XWarningsSupplier extends MultiMethodTest {
         tRes.tested("clearWarnings()", res);
     }
 
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
index 7ae71682bb91..64ce14d88417 100644
--- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
@@ -45,9 +45,6 @@ import util.utils;
 * @see ifc.connection._XAcceptor
 */
 public class Acceptor extends TestCase {
-
-    private XInterface acceptor = null ;
-
     /**
     * Acceptor chooses the first port after <code>basePort</code>
     * which is free.
diff --git a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
index de082c380da5..7e9a5f68f5a7 100644
--- a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
@@ -84,7 +84,6 @@ public class JavaComponentLoader extends TestCase {
         tEnv.addObjRelation("ImplementationLoader",
                                 "com.sun.star.loader.JavaComponentLoader") ;
 
-        String jarname = "MyPersistentObjectImpl.jar";
         String implURL = utils.getFullTestURL("qadevlibs/MyPersistObjectImpl.jar");
         tEnv.addObjRelation("ImplementationUrl", implURL) ;
         log.println("looking for shared lib: " + implURL);
diff --git a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
index 7bb057435f82..6c5f7dc53997 100644
--- a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
@@ -136,7 +136,6 @@ public class NestedRegistry extends TestCase {
     protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
         XInterface oObj = null;
         Object oInterface = null;
-        Object fileAcc = null;
 
         final String tmpDir = utils.getOfficeTempDirSys(
                                     (XMultiServiceFactory)Param.getMSF()) ;
diff --git a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
index 76f5cab28e85..0bcaecc361db 100644
--- a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
@@ -160,7 +160,7 @@ public class various extends TestCase {
         public void run() {
             try {
                 acceptedCall = acc.accept(connectString) ;
-                XBridge xBridge = xBrdgFctr.createBridge("MyBridge", "urp",
+                xBrdgFctr.createBridge("MyBridge", "urp",
                                             acceptedCall, xInstProv);
             } catch (com.sun.star.lang.IllegalArgumentException e) {
                 ex = e ;
diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
index ad16c00bc7a2..a7bcb00a2087 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
@@ -110,9 +110,6 @@ public class MarkableInputStream extends TestCase {
         XActiveDataSource xdSmo = (XActiveDataSource)
             UnoRuntime.queryInterface(XActiveDataSource.class, mostream);
 
-        XOutputStream moStream = (XOutputStream)
-            UnoRuntime.queryInterface(XOutputStream.class, mostream);
-
         XOutputStream PipeOut = (XOutputStream)
             UnoRuntime.queryInterface(XOutputStream.class, aPipe);
         XInputStream PipeIn = (XInputStream)
diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
index 5f9aeac2a598..d7bfd8efbb96 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
@@ -96,10 +96,6 @@ public class MarkableOutputStream extends TestCase {
     protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
 
         XInterface oObj = null;
-        Object ostream = null;
-
-        Object istream = null ;
-        XOutputStream moStream = null ;
 
         XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
         Object aPipe = null;
diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
index d501febc0017..440550a5b444 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
@@ -88,7 +88,6 @@ public class Pipe extends TestCase {
         TestEnvironment tEnv = new TestEnvironment( oObj );
 
         //add relation for io.XOutputStream
-        final XMultiServiceFactory msf = (XMultiServiceFactory)Param.getMSF();
         final XInputStream iStream = (XInputStream)
                 UnoRuntime.queryInterface(XInputStream.class, oObj);
 
@@ -97,7 +96,6 @@ public class Pipe extends TestCase {
 
         tEnv.addObjRelation("XOutputStream.StreamChecker",
             new ifc.io._XOutputStream.StreamChecker() {
-                XInputStream inStream = null;
                 public void resetStreams() {
                 }