INTEGRATION: CWS qadev15 (1.4.18); FILE MERGED

2003/12/16 09:13:57 sw 1.4.18.1: #114449#

qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScConsolidationDescriptor.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-09-08 12:07:22 $
+ *  last change:$Date: 2004-01-05 18:57:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,7 +114,7 @@ public class ScConsolidationDescriptor extends TestCase {
         log.println( "    disposing xSheetDoc " );
         XComponent oComp = (XComponent)
             UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ;
-        oComp.dispose();
+        util.DesktopTools.closeDoc(oComp);
     }
 
     /**

qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScDDELinkObj.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-09-08 12:07:34 $
+ *  last change:$Date: 2004-01-05 18:57:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,9 +131,9 @@ public class ScDDELinkObj extends TestCase {
         log.println( "    disposing xSheetDoc " );
         XComponent oComp = (XComponent)
             UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ;
-        oComp.dispose();
+        util.DesktopTools.closeDoc(oComp);
         if (oDoc != null) {
-            oDoc.dispose();
+            util.DesktopTools.closeDoc(oDoc);
         }
     }
 
@@ -168,7 +168,7 @@ public class ScDDELinkObj extends TestCase {
         XInterface oObj = null;
 
         if (oDoc != null) {
-            oDoc.dispose();
+            util.DesktopTools.closeDoc(oDoc);
         }
 
         // creation of testobject here

qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScDDELinksObj.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-09-08 12:07:44 $
+ *  last change:$Date: 2004-01-05 18:57:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,8 +128,8 @@ public class ScDDELinksObj extends TestCase {
         log.println( "    disposing xSheetDoc " );
         XComponent oComp = (XComponent) UnoRuntime.
                                 queryInterface(XComponent.class, xSheetDoc) ;
-        oComp.dispose();
-        oDoc.dispose();
+        util.DesktopTools.closeDoc(oComp);
+        util.DesktopTools.closeDoc(oDoc);
     }
 
     /**