INTEGRATION: CWS qadev6 (1.1.8); FILE MERGED

2003/05/21 10:55:38 sg 1.1.8.1: #109819# prepare devide of runner

qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ODatabaseSource.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:14:38 $
+ *  last change:$Date: 2003-05-27 12:36:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,14 +143,14 @@ public class ODatabaseSource extends TestCase {
         XMultiServiceFactory xMSF = null ;
 
         try {
-            xMSF = Param.getMSF();
+            xMSF = (XMultiServiceFactory)Param.getMSF();
             oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
 
             xDBContextNameServ = (XNamingService)
                 UnoRuntime.queryInterface(XNamingService.class, oInterface) ;
 
             // retrieving temp directory for database
-            String tmpDatabaseUrl = utils.getOfficeTempDir(Param.getMSF());
+            String tmpDatabaseUrl = utils.getOfficeTempDir((XMultiServiceFactory)Param.getMSF());
 
             tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ;
 
@@ -196,7 +196,7 @@ public class ODatabaseSource extends TestCase {
         // adding obj relation for interface XCompletedConnection
         Object handler = null ;
         try {
-            handler = Param.getMSF().createInstance
+            handler = ((XMultiServiceFactory)Param.getMSF()).createInstance
                 ("com.sun.star.sdb.InteractionHandler") ;
         } catch (com.sun.star.uno.Exception e) {
             log.println("Relation for XCompletedConnection wasn't created") ;

qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ODatasourceAdministrationDialog.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:14:38 $
+ *  last change:$Date: 2003-05-27 12:36:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._dbaccess;
 
 import com.sun.star.uno.XInterface;
+import com.sun.star.lang.XMultiServiceFactory;
 import java.io.PrintWriter;
 import lib.Status;
 import lib.StatusException;
@@ -107,7 +108,7 @@ public class ODatasourceAdministrationDialog extends TestCase {
         Object oInterface = null;
 
         try {
-            oInterface = Param.getMSF().createInstance
+            oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance
                 ("com.sun.star.sdb.DatasourceAdministrationDialog" );
         } catch( com.sun.star.uno.Exception e ) {
             log.println("Service not available" );

qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ODatasourceBrowser.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:14:37 $
+ *  last change:$Date: 2003-05-27 12:37:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 package mod._dbaccess;
 
 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.beans.PropertyValue;
@@ -139,7 +140,7 @@ public class ODatasourceBrowser extends TestCase {
      */
     protected void initialize(TestParameters Param, PrintWriter log) {
         the_Desk = (XDesktop) UnoRuntime.queryInterface(
-                    XDesktop.class, DesktopTools.createDesktop(Param.getMSF()) );
+                    XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()) );
         System.setProperty("hideMe","false");
     }
 
@@ -211,7 +212,7 @@ public class ODatasourceBrowser extends TestCase {
         if (xTextDoc != null) xTextDoc.dispose();
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF());
 
         try {
             log.println( "creating a text document" );