INTEGRATION: CWS qadev11 (1.7.14); FILE MERGED

2003/09/03 15:29:47 sw 1.7.14.1: #112049#

1 files changed, 40 insertions, 25 deletions

diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
index 3936f8c45c42..035307b29792 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleRadioButton.java,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change:$Date: 2003-05-28 10:03:36 $
+ *  last change:$Date: 2003-09-08 13:01:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,22 @@ 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;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XController;
@@ -70,27 +86,13 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.text.XTextDocument;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
+import com.sun.star.util.XCloseable;
 import com.sun.star.util.XURLTransformer;
-import com.sun.star.accessibility.AccessibleRole;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleAction;
-import com.sun.star.accessibility.XAccessibleComponent;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.accessibility.XAccessibleSelection;
-import com.sun.star.accessibility.XAccessibleValue;
-import com.sun.star.awt.XExtendedToolkit;
-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 :
@@ -135,7 +137,7 @@ public class AccessibleRadioButton extends TestCase {
      */
     protected void initialize(TestParameters Param, PrintWriter log) {
         the_Desk = (XDesktop) UnoRuntime.queryInterface(
-                    XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()));
+                    XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF()));
     }
 
     /**
@@ -158,7 +160,7 @@ public class AccessibleRadioButton extends TestCase {
         log.println("disposing xTextDoc");
 
         if (xTextDoc != null) {
-            xTextDoc.dispose();
+            closeDoc();
         }
     }
 
@@ -209,12 +211,12 @@ public class AccessibleRadioButton extends TestCase {
 
         if (xTextDoc != null) {
             log.println("dispose a text document");
-            xTextDoc.dispose();
+            closeDoc();
             xTextDoc = null;
         }
 
         // 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" );
@@ -238,7 +240,7 @@ public class AccessibleRadioButton extends TestCase {
         XURLTransformer urlTransf = null;
 
         try {
-            XInterface transf = (XInterface)((XMultiServiceFactory)tParam.getMSF()).createInstance
+            XInterface transf = (XInterface)( (XMultiServiceFactory) tParam.getMSF()).createInstance
                 ("com.sun.star.util.URLTransformer");
             urlTransf = (XURLTransformer)UnoRuntime.queryInterface
                 (XURLTransformer.class, transf);
@@ -261,7 +263,7 @@ public class AccessibleRadioButton extends TestCase {
 
         XInterface oObj = null;
         try {
-            oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            oObj = (XInterface) ( (XMultiServiceFactory) tParam.getMSF()).createInstance
                 ("com.sun.star.awt.Toolkit") ;
         } catch (com.sun.star.uno.Exception e) {
             log.println("Couldn't get toolkit");
@@ -350,4 +352,17 @@ public class AccessibleRadioButton extends TestCase {
         }
     }
 
-}
+    protected void closeDoc() {
+        XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
+                                    XCloseable.class, xTextDoc);
+
+        try {
+            closer.close(true);
+        } catch (com.sun.star.util.CloseVetoException e) {
+            log.println("Couldn't close document " + e.getMessage());
+        } catch (com.sun.star.lang.DisposedException e) {
+            log.println("Couldn't close document " + e.getMessage());
+        }
+    }
+
+}
\ No newline at end of file