INTEGRATION: CWS qadev15 (1.3.18); FILE MERGED

2003/12/18 17:20:25 sw 1.3.18.1: #114449#

qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlContainerModel.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2003-09-08 13:04:51 $
+ *  last change:$Date: 2004-01-05 20:45:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,16 +60,17 @@
  ************************************************************************/
 package mod._toolkit;
 
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.XInterface;
+
 import java.io.PrintWriter;
 
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
-import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
+import util.utils;
 
 
 public class UnoControlContainerModel extends TestCase {
@@ -78,8 +79,8 @@ public class UnoControlContainerModel extends TestCase {
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) ( (XMultiServiceFactory) param.getMSF())
-                                     .createInstance("com.sun.star.awt.UnoControlContainerModel");
+            oObj = (XInterface) ((XMultiServiceFactory) param.getMSF()).createInstance(
+                           "com.sun.star.awt.UnoControlContainerModel");
         } catch (Exception e) {
             e.printStackTrace(log);
             throw new StatusException("Couldn't create " +

qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlCurrencyField.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2003-09-08 13:05:04 $
+ *  last change:$Date: 2004-01-05 20:46:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,17 +60,6 @@
  ************************************************************************/
 package mod._toolkit;
 
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.FormTools;
-import util.SOfficeFactory;
-import util.WriterTools;
-import util.utils;
-
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDevice;
@@ -88,12 +77,25 @@ import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
 import com.sun.star.view.XControlAccess;
 
+import java.io.PrintWriter;
+
+import lib.StatusException;
+import lib.TestCase;
+import lib.TestEnvironment;
+import lib.TestParameters;
+
+import util.FormTools;
+import util.SOfficeFactory;
+import util.WriterTools;
+import util.utils;
+
 
 public class UnoControlCurrencyField extends TestCase {
     XTextDocument xTextDoc;
 
     protected void initialize(TestParameters Param, PrintWriter log) {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(
+                                     (XMultiServiceFactory) Param.getMSF());
 
         try {
             log.println("creating a textdocument");
@@ -108,15 +110,7 @@ public class UnoControlCurrencyField extends TestCase {
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
-        try {
-            XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
-                                        XCloseable.class, xTextDoc);
-            closer.close(true);
-        } catch (com.sun.star.util.CloseVetoException e) {
-            log.println("couldn't close document");
-        } catch (com.sun.star.lang.DisposedException e) {
-            log.println("couldn't close document");
-        }
+        util.DesktopTools.closeDoc(xTextDoc);
     }
 
     protected TestEnvironment createTestEnvironment(TestParameters Param,