INTEGRATION: CWS qadev15 (1.4.18); FILE MERGED

2003/12/18 17:20:13 sw 1.4.18.2: #114449#
2003/12/18 14:44:32 sw 1.4.18.1: #114449#

qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTabControl.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-09-08 13:02:04 $
+ *  last change:$Date: 2004-01-05 20:39:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,16 +60,6 @@
  ************************************************************************/
 package mod._toolkit;
 
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.AccessibilityTools;
-import util.DesktopTools;
-import util.SOfficeFactory;
-
 import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleAction;
@@ -90,6 +80,17 @@ import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
 
+import java.io.PrintWriter;
+
+import lib.StatusException;
+import lib.TestCase;
+import lib.TestEnvironment;
+import lib.TestParameters;
+
+import util.AccessibilityTools;
+import util.DesktopTools;
+import util.SOfficeFactory;
+
 
 /**
  * Test for object that implements the following interfaces :
@@ -131,7 +132,7 @@ public class AccessibleTabControl extends TestCase {
     protected void initialize(TestParameters Param, PrintWriter log) {
         the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
-        (XMultiServiceFactory) Param.getMSF()));
+                                                                (XMultiServiceFactory) Param.getMSF()));
     }
 
     /**
@@ -151,7 +152,8 @@ public class AccessibleTabControl extends TestCase {
         log.println("disposing xTextDoc");
 
         if (xTextDoc != null) {
-            xTextDoc.dispose();
+            util.DesktopTools.closeDoc(xTextDoc);
+            ;
         }
     }
 
@@ -185,11 +187,13 @@ public class AccessibleTabControl extends TestCase {
         log.println("creating a test environment");
 
         if (xTextDoc != null) {
-            xTextDoc.dispose();
+            util.DesktopTools.closeDoc(xTextDoc);
+            ;
         }
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(
+                                     (XMultiServiceFactory) tParam.getMSF());
 
         try {
             log.println("creating a text document");
@@ -214,8 +218,8 @@ public class AccessibleTabControl extends TestCase {
         XURLTransformer urlTransf = null;
 
         try {
-            XInterface transf = (XInterface) ( (XMultiServiceFactory) tParam.getMSF())
-                                                   .createInstance("com.sun.star.util.URLTransformer");
+            XInterface transf = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+                                        "com.sun.star.util.URLTransformer");
             urlTransf = (XURLTransformer) UnoRuntime.queryInterface(
                                 XURLTransformer.class, transf);
         } catch (com.sun.star.uno.Exception e) {
@@ -240,8 +244,8 @@ public class AccessibleTabControl extends TestCase {
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) ( (XMultiServiceFactory) tParam.getMSF())
-                                      .createInstance("com.sun.star.awt.Toolkit");
+            oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+                           "com.sun.star.awt.Toolkit");
         } catch (com.sun.star.uno.Exception e) {
             log.println("Couldn't get toolkit");
             e.printStackTrace(log);