INTEGRATION: CWS qadev6 (1.1.8); FILE MERGED

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

qadevOOo/tests/java/mod/_toolkit/Toolkit.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Toolkit.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:25 $
+ *  last change:$Date: 2003-05-27 14:00:56 $
  *
  *  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.XWindow;
 import com.sun.star.awt.XWindowPeer;
@@ -90,7 +91,7 @@ public class Toolkit 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" );
@@ -137,7 +138,7 @@ public class Toolkit extends TestCase {
             win = cntrlr.getFrame().getContainerWindow();
             //win = (XWindow) UnoRuntime.queryInterface(XWindow.class, ctrl) ;
             the_win = the_access.getControl(the_Model).getPeer();
-            oObj = (XInterface) Param.getMSF().createInstance
+            oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance
                 ("com.sun.star.awt.Toolkit") ;
         } catch (com.sun.star.uno.Exception e) {
             log.println("Couldn't get toolkit");

qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlButton.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:25 $
+ *  last change:$Date: 2003-05-27 14:01:08 $
  *
  *  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.XControlModel;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.XDevice;
 import com.sun.star.awt.XGraphics;
 import com.sun.star.awt.XToolkit;
@@ -91,12 +92,12 @@ public class UnoControlButton extends TestCase {
     XTextDocument xTD2;
 
     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" );
             xTextDoc = SOF.createTextDoc( null );
-            xTD2 = WriterTools.createTextDoc(Param.getMSF());
+            xTD2 = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF());
         } catch ( com.sun.star.uno.Exception e ) {
             // Some exception occures.FAILED
             e.printStackTrace( log );

qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlButtonModel.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:19:24 $
+ *  last change:$Date: 2003-05-27 14:01:18 $
  *
  *  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.beans.XPropertySet;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 import java.io.PrintWriter;
@@ -82,7 +83,7 @@ public class UnoControlButtonModel 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());
     }
 
     /**
@@ -103,7 +104,7 @@ public class UnoControlButtonModel extends TestCase {
         Object wat = null;
 
         try {
-            oObj = (XInterface) Param.getMSF().createInstance(
+            oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance(
                                     "com.sun.star.awt.UnoControlButtonModel");
         } catch (Exception e) {
             e.printStackTrace( log );