summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Langhans <lla@openoffice.org>2010-02-09 11:43:47 +0100
committerLars Langhans <lla@openoffice.org>2010-02-09 11:43:47 +0100
commit46feaa99faff38763a172beddba10f94fed6070e (patch)
tree771ec2c136d1017c3a86c57d90f02d255b88a156
parent506f93daa2eb0806dd9feb0aacef040e3a4c71ed (diff)
qadev40: #i106419# patch integrated
-rw-r--r--qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java3
-rw-r--r--qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java1
-rw-r--r--qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java1
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge.uno/various.java2
-rw-r--r--qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java3
-rw-r--r--qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java4
-rw-r--r--qadevOOo/tests/java/mod/_streams.uno/Pipe.java2
7 files changed, 1 insertions, 15 deletions
diff --git a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
index b02a6b9c8f40..edceb345070c 100644
--- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
@@ -48,9 +48,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 8a77763fc52a..e08b2e618be9 100644
--- a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
@@ -87,7 +87,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 7580e396938c..7cfe7baa1288 100644
--- a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
@@ -139,7 +139,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 bba6b5dd5183..b00b59d654e5 100644
--- a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
@@ -163,7 +163,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 a1d11668630b..7f9bb5e1f5f7 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
@@ -113,9 +113,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 71e41812d393..0d57fc2e2f3e 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
@@ -99,10 +99,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 816e04b134d0..07f0ed120a84 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
+++ b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
@@ -91,7 +91,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);
@@ -100,7 +99,6 @@ public class Pipe extends TestCase {
tEnv.addObjRelation("XOutputStream.StreamChecker",
new ifc.io._XOutputStream.StreamChecker() {
- XInputStream inStream = null;
public void resetStreams() {
}