INTEGRATION: CWS qadev6 (1.1.8); FILE MERGED

2003/05/21 10:56:01 sg 1.1.8.1: #109819# prepare devide of runner

3 files changed, 15 insertions, 12 deletions

diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
index 5c9293c96dbe..d60c0da9861d 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ORadioButtonControl.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:15:01 $
+ *  last change:$Date: 2003-05-27 12:45:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._forms;
 
 import com.sun.star.awt.XControl;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDevice;
 import com.sun.star.awt.XGraphics;
@@ -125,7 +126,7 @@ public class ORadioButtonControl extends TestCase {
      * Creates a new text document.
      */
     protected void initialize ( TestParameters Param, PrintWriter log) {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() );
 
         try {
             log.println( "creating a textdocument" );
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
index 78d8ccc58129..7bd1cd2215d5 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ORadioButtonModel.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:15:01 $
+ *  last change:$Date: 2003-05-27 12:45:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._forms;
 
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.drawing.XShape;
 import com.sun.star.form.XBoundComponent;
@@ -154,7 +155,7 @@ public class ORadioButtonModel extends TestCase {
     */
     protected void initialize( TestParameters tParam, PrintWriter log ) {
         log.println( "creating a text document" );
-        xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
+        xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)tParam.getMSF());
     }
 
     /**
@@ -202,7 +203,7 @@ public class ORadioButtonModel extends TestCase {
         log.println( "creating a test environment" );
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF());
 
         //get RadioButtonModel
         String objName = "RadioButton";
@@ -214,7 +215,7 @@ public class ORadioButtonModel extends TestCase {
 
         XLoadable formLoader = null ;
         try {
-            DBTools dbTools = new DBTools(Param.getMSF()) ;
+            DBTools dbTools = new DBTools((XMultiServiceFactory)Param.getMSF()) ;
             dbTools.registerTestDB((String) System.getProperty("DOCPTH")) ;
 
             formLoader = FormTools.bindForm(xTextDoc,
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index 2ff0ce01479a..e4f67b01ddde 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OTimeControl.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:15:00 $
+ *  last change:$Date: 2003-05-27 12:46:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._forms;
 
 import com.sun.star.awt.XControl;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDevice;
 import com.sun.star.awt.XGraphics;
@@ -137,7 +138,7 @@ public class OTimeControl extends TestCase {
      * Creates a new text document.
      */
     protected void initialize ( TestParameters Param, PrintWriter log) {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() );
 
         try {
             log.println( "creating a textdocument" );
@@ -254,7 +255,7 @@ public class OTimeControl extends TestCase {
         textComp.addTextListener(listener);
         tEnv.addObjRelation("TestTextListener", listener);
 
-        FormTools.switchDesignOf(Param.getMSF(),xTextDoc);
+        FormTools.switchDesignOf((XMultiServiceFactory)Param.getMSF(),xTextDoc);
         shortWait();
         return tEnv;
     } // finish method getTestEnvironment