INTEGRATION: CWS qadev6 (1.3.2); FILE MERGED

2003/05/21 10:56:38 sg 1.3.2.1: #109819# prepare devide of runner

2 files changed, 13 insertions, 11 deletions

diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 569f961ffd66..a7738f475551 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -2,7 +2,7 @@
  *
  *  $RCSfile: ScAccessibleDocumentPagePreview.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
  *  last change: $Author: vg $
  *
@@ -62,6 +62,7 @@
 package mod._sc;
 
 import com.sun.star.awt.XWindow;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XController;
@@ -181,7 +182,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
                 UnoRuntime.queryInterface(XDispatchProvider.class, xController);
             XURLTransformer xParser = (com.sun.star.util.XURLTransformer)
                 UnoRuntime.queryInterface(XURLTransformer.class,
-            Param.getMSF().createInstance("com.sun.star.util.URLTransformer"));
+            ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer"));
             // Because it's an in/out parameter we must use an array of URL objects.
             URL[] aParseURL = new URL[1];
             aParseURL[0] = new URL();
@@ -202,7 +203,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
 
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = at.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel);
         XAccessible xRoot = at.getAccessibleObject(xWindow);
         //at.printAccessibleTree(log,xRoot);
         XAccessibleContext mainWin = at.getAccessibleObjectForRole(xRoot,AccessibleRole.TOOL_BAR,"Page View");
@@ -238,7 +239,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
         TestEnvironment tEnv = new TestEnvironment(oObj);
 
         XDesktop desk = (XDesktop) UnoRuntime.queryInterface(
-                XDesktop.class,util.DesktopTools.createDesktop(Param.getMSF()));
+                XDesktop.class,util.DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()));
         final XWindow win = desk.getCurrentFrame().getComponentWindow();
 
         tEnv.addObjRelation("EventProducer",
@@ -280,7 +281,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
      */
     protected void initialize(TestParameters Param, PrintWriter log) {
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF());
 
         try {
             log.println("creating a spreadsheetdocument");
@@ -296,4 +297,4 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
             throw new StatusException( "Couldn't create document ", e );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 687b53074ded..6445909a1233 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -2,7 +2,7 @@
  *
  *  $RCSfile: ScAccessiblePageHeader.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
  *  last change: $Author: vg $
  *
@@ -62,6 +62,7 @@
 package mod._sc;
 
 import com.sun.star.awt.XWindow;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
@@ -171,7 +172,7 @@ public class ScAccessiblePageHeader extends TestCase {
                 UnoRuntime.queryInterface(XDispatchProvider.class, xController);
             XURLTransformer xParser = (com.sun.star.util.XURLTransformer)
                 UnoRuntime.queryInterface(XURLTransformer.class,
-            Param.getMSF().createInstance("com.sun.star.util.URLTransformer"));
+            ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer"));
             // Because it's an in/out parameter we must use an array of URL objects.
             URL[] aParseURL = new URL[1];
             aParseURL[0] = new URL();
@@ -192,7 +193,7 @@ public class ScAccessiblePageHeader extends TestCase {
 
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = at.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel);
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole
@@ -301,7 +302,7 @@ public class ScAccessiblePageHeader extends TestCase {
      */
     protected void initialize(TestParameters Param, PrintWriter log) {
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF());
 
         try {
             log.println("creating a spreadsheetdocument");
@@ -311,4 +312,4 @@ public class ScAccessiblePageHeader extends TestCase {
             throw new StatusException( "Couldn't create document ", e );
         }
     }
-}
\ No newline at end of file
+}