INTEGRATION: CWS qadev6 (1.1.8); FILE MERGED

2003/05/21 10:59:17 sg 1.1.8.1: #109819# prepare devide of runner

qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlListBoxModel.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:14 $
+ *  last change:$Date: 2003-05-27 14:06:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._toolkit;
 
 import com.sun.star.text.XTextDocument;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 import java.io.PrintWriter;
 import lib.StatusException;
@@ -81,7 +82,7 @@ public class UnoControlListBoxModel extends TestCase {
     protected void initialize( TestParameters tParam, PrintWriter log ) {
 
         log.println( "creating a textdocument" );
-        xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
+        xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)tParam.getMSF());
     }
 
     /**
@@ -100,7 +101,7 @@ public class UnoControlListBoxModel extends TestCase {
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) Param.getMSF().createInstance(
+            oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance(
                                     "com.sun.star.awt.UnoControlListBoxModel");
         } catch (Exception e) {
 

qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlNumericField.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:14 $
+ *  last change:$Date: 2003-05-27 14:06:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._toolkit;
 
 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;
@@ -90,7 +91,7 @@ public class UnoControlNumericField extends TestCase {
     XTextDocument xTextDoc;
 
     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" );

qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlNumericFieldModel.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:13 $
+ *  last change:$Date: 2003-05-27 14:06:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._toolkit;
 
 import com.sun.star.text.XTextDocument;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 import java.io.PrintWriter;
 import lib.StatusException;
@@ -81,7 +82,7 @@ public class UnoControlNumericFieldModel extends TestCase {
     protected void initialize( TestParameters tParam, PrintWriter log ) {
 
         log.println( "creating a textdocument" );
-        xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
+        xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)tParam.getMSF());
     }
 
     /**
@@ -99,7 +100,7 @@ public class UnoControlNumericFieldModel extends TestCase {
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) Param.getMSF().createInstance(
+            oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance(
                 "com.sun.star.awt.UnoControlNumericFieldModel");
         } catch (Exception e) {