INTEGRATION: CWS qadev15 (1.3.18); FILE MERGED

2003/12/18 17:20:36 sw 1.3.18.1: #114449#
This commit is contained in:
Oliver Bolte
2004-01-05 19:54:08 +00:00
parent 35451d16a5
commit feaea69949
2 changed files with 25 additions and 30 deletions

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: UnoControlImageControl.java,v $ * $RCSfile: UnoControlImageControl.java,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change:$Date: 2003-09-08 13:08:14 $ * last change:$Date: 2004-01-05 20:53:45 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -60,17 +60,6 @@
************************************************************************/ ************************************************************************/
package mod._toolkit; 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.XControl;
import com.sun.star.awt.XControlModel; import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XDevice; 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.util.XCloseable;
import com.sun.star.view.XControlAccess; 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 UnoControlImageControl extends TestCase { public class UnoControlImageControl extends TestCase {
XTextDocument xTextDoc; XTextDocument xTextDoc;
protected void initialize(TestParameters Param, PrintWriter log) { protected void initialize(TestParameters Param, PrintWriter log) {
SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); SOfficeFactory SOF = SOfficeFactory.getFactory(
(XMultiServiceFactory) Param.getMSF());
try { try {
log.println("creating a textdocument"); log.println("creating a textdocument");
@@ -108,15 +110,7 @@ public class UnoControlImageControl extends TestCase {
protected void cleanup(TestParameters tParam, PrintWriter log) { protected void cleanup(TestParameters tParam, PrintWriter log) {
log.println(" disposing xTextDoc "); log.println(" disposing xTextDoc ");
try { util.DesktopTools.closeDoc(xTextDoc);
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");
}
} }
protected TestEnvironment createTestEnvironment(TestParameters Param, protected TestEnvironment createTestEnvironment(TestParameters Param,

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: UnoControlImageControlModel.java,v $ * $RCSfile: UnoControlImageControlModel.java,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change:$Date: 2003-09-08 13:08:29 $ * last change:$Date: 2004-01-05 20:54:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -60,15 +60,16 @@
************************************************************************/ ************************************************************************/
package mod._toolkit; package mod._toolkit;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter; import java.io.PrintWriter;
import lib.TestCase; import lib.TestCase;
import lib.TestEnvironment; import lib.TestEnvironment;
import lib.TestParameters; import lib.TestParameters;
import util.utils;
import com.sun.star.lang.XMultiServiceFactory; import util.utils;
import com.sun.star.uno.XInterface;
public class UnoControlImageControlModel extends TestCase { public class UnoControlImageControlModel extends TestCase {
@@ -77,8 +78,8 @@ public class UnoControlImageControlModel extends TestCase {
XInterface oObj = null; XInterface oObj = null;
try { try {
oObj = (XInterface) ( (XMultiServiceFactory) Param.getMSF()) oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance(
.createInstance("com.sun.star.awt.UnoControlImageControlModel"); "com.sun.star.awt.UnoControlImageControlModel");
} catch (Exception e) { } catch (Exception e) {
} }