diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 07:44:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 07:44:27 +0000 |
| commit | 122adddbef72cf66affd2c7c77f146d6b3461f9b (patch) | |
| tree | afe42e1c328dc82500cccd969b34e85ef1f6e8cf /qadevOOo/tests | |
| parent | 32bdad3936d902cf3626ceed29c2025a17ca2d0c (diff) | |
CWS-TOOLING: integrate CWS qadev33
Diffstat (limited to 'qadevOOo/tests')
52 files changed, 289 insertions, 248 deletions
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 98dda6dc1ae8..80648ae34e06 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -72,11 +72,11 @@ import util.utils; */ public class CheckModuleAPI extends ComplexTestCase { - private String mSRC_ROOT = null; - private boolean mIsInitialized = false; + private static String mSRC_ROOT = null; + private static boolean mIsInitialized = false; private final static boolean mContinue = true; - private boolean mDebug = false; - private BuildEnvTools bet = null; + private static boolean mDebug = false; + private static BuildEnvTools bet = null; /** * Initialize the test environment. @@ -104,30 +104,6 @@ public class CheckModuleAPI extends ComplexTestCase { mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE); - // this test is desingt to run against a freshly installed office. Maybe this office has currently no - // no user installation. The first start of an office creates this installation and this takes some - // more time to connect to the office. - // Note: This is only usefull with parameter -NoOffice true - try { - final OfficeProvider officeProvider = new OfficeProvider(); - log.println("Receiving the ServiceManager of the Office to create User installation..."); - - final int timeOut = param.getInt(PropertyName.TIME_OUT); - param.put(PropertyName.TIME_OUT, new Integer(4 * timeOut)); - - final XMultiServiceFactory msf = (XMultiServiceFactory) officeProvider.getManager(param); - - officeProvider.backupUserLayer(param, msf); - - param.put(PropertyName.TIME_OUT, new Integer(timeOut)); - - if (msf == null) { - failed("Could not connect the office"); - } - } catch (Throwable t) { - failed("Could not start office " + t.toString()); - } - } } @@ -232,8 +208,8 @@ public class CheckModuleAPI extends ComplexTestCase { cmdLines = new String[]{"cdd " + sUnoapi, "dmake"}; // cmdLines = new String[]{shell, "/C ", "\"echo Test ^ " + envcmd + " ^ cdd " + sUnoapi + "^ pwd ^ dmake\""}; } else { - cmdLines = new String[]{"cd " + sUnoapi, "dmake"}; - } + cmdLines = new String[]{"cd " + sUnoapi, "dmake"}; + } return cmdLines; } diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 20180f232efc..701a402aaa22 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: _XUserInputInterception.java,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.8.1 $ * * This file is part of OpenOffice.org. * @@ -473,7 +473,7 @@ public class _XUserInputInterception extends MultiMethodTest { private void clickIntoDoc(){ try{ - util.DesktopTools.bringWindowToFromt(xModel); + util.DesktopTools.bringWindowToFront(xModel); XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) tParam.getMSF(), diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java index 46ba69f93685..1af6e6daa071 100644 --- a/qadevOOo/tests/java/ifc/lang/_XComponent.java +++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: _XComponent.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.8.1 $ * * This file is part of OpenOffice.org. * @@ -143,7 +143,7 @@ public class _XComponent extends MultiMethodTest { disposed = false; executeMethod("removeEventListener()"); - log.println( "begin dispose" + Thread.currentThread()); + log.println( "begin dispose in thread " + Thread.currentThread()); XDesktop oDesk = (XDesktop) tEnv.getObjRelation("Desktop"); if (oDesk !=null) { oDesk.terminate(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index 4db803924d82..fc60dff0fb26 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: _XEnhancedMouseClickBroadcaster.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -66,7 +66,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { public void before() { docModel = (XModel) UnoRuntime.queryInterface( XModel.class,tEnv.getObjRelation("FirstModel")); - DesktopTools.bringWindowToFromt(docModel); + DesktopTools.bringWindowToFront(docModel); } public void _addEnhancedMouseClickHandler() { diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index 645ef9a5043d..5327b7b11098 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: _XContextMenuInterception.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * * This file is part of OpenOffice.org. * @@ -78,7 +78,7 @@ public class _XContextMenuInterception extends MultiMethodTest { //ensure that the first model is focused log.println("ensure that the first model is focused"); - DesktopTools.bringWindowToFromt(docModel); + DesktopTools.bringWindowToFront(docModel); utils.shortWait(3000); } diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 4c5dcb4e0092..10659c973fae 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OQueryDesign.java,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.8.1 $ * * This file is part of OpenOffice.org. * @@ -31,6 +31,11 @@ package mod._dbaccess; //import com.sun.star.awt.XControl; //import com.sun.star.awt.XControlModel; +import com.sun.star.container.NoSuchElementException; +import com.sun.star.lang.WrappedTargetException; +import com.sun.star.sdbc.SQLException; +import com.sun.star.sdbc.XConnection; +import com.sun.star.uno.Exception; import java.io.PrintWriter; import lib.TestCase; @@ -55,18 +60,23 @@ import com.sun.star.util.URL; import lib.StatusException; import util.SOfficeFactory; import com.sun.star.sdb.XDocumentDataSource; +import com.sun.star.sdbc.XDataSource; +import com.sun.star.ucb.XSimpleFileAccess; public class OQueryDesign extends TestCase { - private XDesktop Desk; - private XFrame Frame; + private static XDesktop xDesk; + private static XFrame xFrame; private final String sDataSourceName = "Bibliography"; + private static XConnection xConn; + private static XTextDocument xTextDoc; + /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - Desk = (XDesktop) UnoRuntime.queryInterface( + xDesk = (XDesktop) UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()) ); } @@ -77,9 +87,50 @@ public class OQueryDesign extends TestCase { XInterface oObj = null; XDispatchProvider aProv = (XDispatchProvider) - UnoRuntime.queryInterface(XDispatchProvider.class,Desk); + UnoRuntime.queryInterface(XDispatchProvider.class,xDesk); XDispatch getting = null; + XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + + XNameAccess xNameAccess = null; + + // we use the first datasource + XDataSource xDS = null; + try { + xNameAccess = (XNameAccess) UnoRuntime.queryInterface( + XNameAccess.class, + xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); + } catch (Exception ex) { + ex.printStackTrace( log ); + throw new StatusException( "Could not get Databasecontext", ex ); + } + try { + xDS = (XDataSource) UnoRuntime.queryInterface( + XDataSource.class, xNameAccess.getByName( "Bibliography" )); + } catch (NoSuchElementException ex) { + ex.printStackTrace( log ); + throw new StatusException( "Could not get XDataSource", ex ); + } catch (WrappedTargetException ex) { + ex.printStackTrace( log ); + throw new StatusException( "Could not get XDataSource", ex ); + } + try { + xNameAccess = (XNameAccess) UnoRuntime.queryInterface( + XNameAccess.class, + xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); + } catch (Exception ex) { + ex.printStackTrace( log ); + throw new StatusException( "Could not get DatabaseConext", ex ); + } + + log.println("check XMultiServiceFactory"); + + try { + xConn = xDS.getConnection(new String(), new String()); + } catch (SQLException ex) { + ex.printStackTrace( log ); + throw new StatusException( "Could not get XConnection", ex ); + } log.println( "opening QueryDesign" ); URL the_url = new URL(); @@ -94,15 +145,16 @@ public class OQueryDesign extends TestCase { param2.Name = "QueryDesignView"; param2.Value = new Boolean(false); Args[1] = param2; + param1.Name = "ActiveConnection"; + param1.Value = xConn; + Args[1] = param2; getting.dispatch(the_url,Args); shortWait(); Object oDBC = null; - XMultiServiceFactory xMSF; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); } catch( com.sun.star.uno.Exception e ) { @@ -119,13 +171,14 @@ public class OQueryDesign extends TestCase { throw new StatusException("could not get '" + sDataSourceName + "'" , e) ; } XDocumentDataSource xDDS = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); - XModel xMod = (XModel) UnoRuntime.queryInterface(XModel.class, xDDS.getDatabaseDocument ()); +// XModel xMod = (XModel) UnoRuntime.queryInterface(XModel.class, xDDS.getDatabaseDocument ()); + +// Frame = xMod.getCurrentController().getFrame(); - Frame = xMod.getCurrentController().getFrame(); + xFrame = DesktopTools.getCurrentFrame(xMSF); // get an instance of Frame Object oFrame = null; - XTextDocument xTextDoc = null;; SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); @@ -156,7 +209,7 @@ public class OQueryDesign extends TestCase { params[2] = param3; - oObj = Frame.getController(); + oObj = xFrame.getController(); TestEnvironment tEnv = new TestEnvironment(oObj); @@ -182,7 +235,7 @@ public class OQueryDesign extends TestCase { tEnv.addObjRelation("XInitialization.ExceptionArgs", ExceptionParams); - tEnv.addObjRelation("Frame", Frame); + tEnv.addObjRelation("Frame", xFrame); tEnv.addObjRelation("XInitialization.xIni", getUnititializedObj(Param)); @@ -245,6 +298,21 @@ public class OQueryDesign extends TestCase { } + @Override + protected void cleanup(TestParameters tParam, PrintWriter log) { + try { + xConn.close() ; + DesktopTools.closeDoc(xFrame); + DesktopTools.closeDoc(xTextDoc); + } catch (com.sun.star.uno.Exception e) { + log.println("Can't close the connection") ; + e.printStackTrace(log) ; + } catch (com.sun.star.lang.DisposedException e) { + log.println("Connection was already closed. It's OK.") ; + } + + } + /** * Sleeps for 0.2 sec. to allow StarOffice to react on <code> * reset</code> call. diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java index 6d3da690a227..957fcfaa0596 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DrawController_HandoutView.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * * This file is part of OpenOffice.org. * @@ -233,7 +233,7 @@ public class DrawController_HandoutView extends TestCase { XInterface oObj = aModel.getCurrentController(); log.println("bring first document to front..."); - DesktopTools.bringWindowToFromt(aModel); + DesktopTools.bringWindowToFront(aModel); XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java index 41c0794ff89b..a99dafbfb20a 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DrawController_NotesView.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * * This file is part of OpenOffice.org. * @@ -230,7 +230,7 @@ public class DrawController_NotesView extends TestCase { XInterface oObj = aModel.getCurrentController(); log.println("bring first document to front..."); - DesktopTools.bringWindowToFromt(aModel); + DesktopTools.bringWindowToFront(aModel); XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java index 0357426e0830..deaf2cafe752 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DrawController_OutlineView.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * * This file is part of OpenOffice.org. * @@ -230,7 +230,7 @@ public class DrawController_OutlineView extends TestCase { XInterface oObj = aModel.getCurrentController(); log.println("bring first document to front..."); - DesktopTools.bringWindowToFromt(aModel); + DesktopTools.bringWindowToFront(aModel); XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java index 45139fe507cd..d3e5bf84cc4d 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DrawController_PresentationView.java,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.8.1 $ * * This file is part of OpenOffice.org. * @@ -230,7 +230,7 @@ public class DrawController_PresentationView extends TestCase { XInterface oObj = aModel.getCurrentController(); log.println("bring first document to front..."); - DesktopTools.bringWindowToFromt(aModel); + DesktopTools.bringWindowToFront(aModel); XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 7c03fb089f31..32717be5f6d2 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleBrowseBox.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.2 $ * * This file is part of OpenOffice.org. * @@ -27,7 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package mod._svtools; import java.io.PrintWriter; @@ -51,31 +50,31 @@ import com.sun.star.frame.XDispatch; import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; -import com.sun.star.lang.XInitialization; 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.view.XSelectionSupplier; public class AccessibleBrowseBox extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; + static XDesktop the_Desk; + static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ 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())); } /** * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ - protected void cleanup( TestParameters Param, PrintWriter log) { + protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -98,41 +97,40 @@ public class AccessibleBrowseBox extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - log.println( "creating a test environment" ); - - if (xTextDoc != null) xTextDoc.dispose(); + log.println("creating a test environment"); - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + if (xTextDoc != null) { + xTextDoc.dispose(); // get a soffice factory object + } + SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); try { - log.println( "creating a text document" ); + log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); - } catch ( com.sun.star.uno.Exception e ) { + } catch (com.sun.star.uno.Exception e) { // Some exception occures.FAILED - e.printStackTrace( log ); - throw new StatusException( "Couldn't create document", e ); + e.printStackTrace(log); + throw new StatusException("Couldn't create document", e); } shortWait(); - XModel aModel1 = (XModel) - UnoRuntime.queryInterface(XModel.class, xTextDoc); + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); - XDispatchProvider aProv = (XDispatchProvider) - UnoRuntime.queryInterface(XDispatchProvider.class,secondController); + XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, + secondController); XDispatch getting = null; - log.println( "opening DatasourceBrowser" ); + log.println("opening DatasourceBrowser"); URL the_url = new URL(); the_url.Complete = ".component:DB/DataSourceBrowser"; - getting = aProv.queryDispatch(the_url,"_beamer",12); + getting = aProv.queryDispatch(the_url, "_beamer", 12); PropertyValue[] noArgs = new PropertyValue[0]; - getting.dispatch(the_url,noArgs); + getting.dispatch(the_url, noArgs); shortWait(); @@ -142,71 +140,61 @@ public class AccessibleBrowseBox extends TestCase { log.println("Current frame was not found !!!"); } - XFrame the_frame2 = the_frame1.findFrame("_beamer",4); + XFrame the_frame2 = the_frame1.findFrame("_beamer", 4); the_frame2.setName("DatasourceBrowser"); XInterface oObj = null; - final XInitialization xInit = (XInitialization) - UnoRuntime.queryInterface( - XInitialization.class, the_frame2.getController()); - - Object[] params = new Object[3]; - PropertyValue param1 = new PropertyValue(); - param1.Name = "DataSourceName"; - param1.Value = "Bibliography"; - params[0] = param1; - PropertyValue param2 = new PropertyValue(); - param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); - params[1] = param2; - PropertyValue param3 = new PropertyValue(); - param3.Name = "Command"; - param3.Value = "biblio"; - params[2] = param3; - - final Object[] fParams = params; + final XSelectionSupplier xSelect = (XSelectionSupplier) UnoRuntime.queryInterface( + XSelectionSupplier.class, the_frame2.getController()); + + PropertyValue[] params = new PropertyValue[]{new PropertyValue(), new PropertyValue(), new PropertyValue()}; + params[0].Name = "DataSourceName"; + params[0].Value = "Bibliography"; + params[1].Name = "CommandType"; + params[1].Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + params[2].Name = "Command"; + params[2].Value = "biblio"; + + final PropertyValue[] fParams = params; shortWait(); 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); - throw new StatusException("Couldn't get toolkit", e ); + throw new StatusException("Couldn't get toolkit", e); } - XExtendedToolkit tk = (XExtendedToolkit) - UnoRuntime.queryInterface(XExtendedToolkit.class,oObj); + XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(XExtendedToolkit.class, oObj); AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = (XWindow) - UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.PANEL, "", "AccessibleBrowseBox"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "AccessibleBrowseBox"); - log.println("ImplementationName: "+util.utils.getImplName(oObj)); + log.println("ImplementationName: " + util.utils.getImplName(oObj)); - TestEnvironment tEnv = new TestEnvironment( oObj ); + TestEnvironment tEnv = new TestEnvironment(oObj); tEnv.addObjRelation("EventProducer", - new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){ + new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { + public void fireEvent() { try { - xInit.initialize(fParams); - } catch(com.sun.star.uno.Exception e) { + xSelect.select(fParams); + } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); } } @@ -216,15 +204,15 @@ public class AccessibleBrowseBox extends TestCase { } /** - * Sleeps for 0.5 sec. to allow StarOffice to react on <code> - * reset</code> call. - */ + * Sleeps for 0.5 sec. to allow StarOffice to react on <code> + * reset</code> call. + */ private void shortWait() { try { - Thread.currentThread().sleep(500) ; + Thread.sleep(5000); + ; } catch (InterruptedException e) { - System.out.println("While waiting :" + e) ; + System.out.println("While waiting :" + e); } } - } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index 7541f02da164..0a4a516752e4 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleBrowseBoxHeaderBar.java,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.8.1 $ * * This file is part of OpenOffice.org. * @@ -83,8 +83,8 @@ import com.sun.star.util.URL; * @see ifc.accessibility._XAccessibleContext */ public class AccessibleBrowseBoxHeaderBar extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; + static XDesktop the_Desk; + static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -266,7 +266,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000);; } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 6468376f73ba..ca6104cd219f 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleBrowseBoxHeaderCell.java,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.8.1 $ * * This file is part of OpenOffice.org. * @@ -247,7 +247,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500) ; + Thread.sleep(5000); ; } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 033a003ffd1b..ec48b02b1f34 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleBrowseBoxTable.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * * This file is part of OpenOffice.org. * @@ -76,8 +76,8 @@ import com.sun.star.util.URL; * @see ifc.accessibility._XAccessibleContext */ public class AccessibleBrowseBoxTable extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; + static XDesktop the_Desk; + static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -248,7 +248,7 @@ public class AccessibleBrowseBoxTable extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 71c9060b0802..c0a50d4f01db 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleBrowseBoxTableCell.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -76,8 +76,8 @@ import com.sun.star.util.URL; */ public class AccessibleBrowseBoxTableCell extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; + static XDesktop the_Desk; + static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -238,7 +238,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500) ; + Thread.sleep(5000); ; } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index 7091db184604..d73f197f18d4 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleIconChoiceCtrl.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -84,9 +84,9 @@ import com.sun.star.util.XURLTransformer; * @see ifc.accessibility._XAccessibleSelection */ public class AccessibleIconChoiceCtrl extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; - XAccessibleAction accCloseButton = null; + static XDesktop the_Desk; + static XTextDocument xTextDoc; + static XAccessibleAction accCloseButton = null; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -282,7 +282,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index 68fe710c4247..aff986416948 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleIconChoiceCtrlEntry.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -84,9 +84,9 @@ import com.sun.star.util.XURLTransformer; */ public class AccessibleIconChoiceCtrlEntry extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; - XAccessibleAction accCloseButton = null; + static XDesktop the_Desk; + static XTextDocument xTextDoc; + static XAccessibleAction accCloseButton = null; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -258,7 +258,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500) ; + Thread.sleep(5000); ; } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 61e7356d95f7..8927bc015e60 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleTabBar.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * * This file is part of OpenOffice.org. * @@ -51,7 +51,7 @@ import com.sun.star.util.XCloseable; public class AccessibleTabBar extends TestCase { - XComponent xDoc; + static XComponent xDoc; /** * Disposes the document, if exists, created in @@ -150,12 +150,12 @@ public class AccessibleTabBar extends TestCase { } /** - * Sleeps for 0.5 sec. to allow StarOffice to react on <code> + * Sleeps for 3 sec. to allow StarOffice to react on <code> * reset</code> call. */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index c01ce213fccc..6ab70b2af79e 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleTabBarPage.java,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.8.1 $ * * This file is part of OpenOffice.org. * @@ -87,7 +87,7 @@ import com.sun.star.uno.XInterface; */ public class AccessibleTabBarPage extends TestCase { - XComponent xDoc; + static XComponent xDoc; /** * Disposes the document, if exists, created in @@ -197,7 +197,7 @@ public class AccessibleTabBarPage extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500) ; + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index 93d8a7d6fa5c..7b376ac029bf 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleTabBarPageList.java,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.8.1 $ * * This file is part of OpenOffice.org. * @@ -79,7 +79,7 @@ import com.sun.star.util.XCloseable; * @see ifc.accessibility._XAccessibleContext */ public class AccessibleTabBarPageList extends TestCase { - XComponent xDoc; + static XComponent xDoc; /** * Disposes the document, if exists, created in @@ -191,7 +191,7 @@ public class AccessibleTabBarPageList extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index a9c0d92953ae..73453427ce4d 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleTreeListBox.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -82,8 +82,8 @@ import com.sun.star.util.URL; */ public class AccessibleTreeListBox extends TestCase { - XDesktop the_Desk; - XTextDocument xTextDoc; + static XDesktop the_Desk; + static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). @@ -257,7 +257,7 @@ public class AccessibleTreeListBox extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(2000) ; + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index ab38895ca994..8746ed4328ed 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleTreeListBoxEntry.java,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.8.1 $ * * This file is part of OpenOffice.org. * @@ -291,7 +291,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { */ private void shortWait() { try { - Thread.currentThread().sleep(500); + Thread.sleep(5000); } catch (InterruptedException e) { System.out.println("While waiting :" + e); } diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index 447cb33473ce..bf1845ad7812 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleControlShape.java,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.8.2 $ * * This file is part of OpenOffice.org. * @@ -54,8 +54,8 @@ import com.sun.star.uno.XInterface; public class AccessibleControlShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -93,7 +93,7 @@ public class AccessibleControlShape extends TestCase { (xDrawDoc,3000,4500,15000,1000,"CommandButton"); AccessibilityTools at = new AccessibilityTools(); - + utils.shortWait(5000); XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -101,8 +101,9 @@ public class AccessibleControlShape extends TestCase { at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, - "Button"); +// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, +// "Button"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 3924663b86c0..3a140ebef08a 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleEditableTextPara.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.8.2 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,7 @@ import com.sun.star.uno.XInterface; public class AccessibleEditableTextPara extends TestCase { - XComponent xSpreadsheetDoc = null; + static XComponent xSpreadsheetDoc = null; /** * Called to create an instance of <code>TestEnvironment</code> @@ -81,7 +81,9 @@ public class AccessibleEditableTextPara extends TestCase { XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext InputLine = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL,"Input line"); + at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + + XAccessibleContext InputLine = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME,"Input line"); try { oObj = InputLine.getAccessibleChild(0); XAccessibleEditableText et = (XAccessibleEditableText) UnoRuntime.queryInterface(XAccessibleEditableText.class, oObj); @@ -89,7 +91,6 @@ public class AccessibleEditableTextPara extends TestCase { } catch (com.sun.star.lang.IndexOutOfBoundsException e) { } - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index b3c34f51a732..6e8bc7a8c9fd 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleGraphicShape.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.2 $ * * This file is part of OpenOffice.org. * @@ -54,8 +54,8 @@ import com.sun.star.uno.XInterface; public class AccessibleGraphicShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -104,8 +104,9 @@ public class AccessibleGraphicShape extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "GraphicObject"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index ee89b660d02a..a3c121c147c1 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleOLEShape.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.2 $ * * This file is part of OpenOffice.org. * @@ -55,8 +55,8 @@ import com.sun.star.uno.XInterface; public class AccessibleOLEShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -127,8 +127,9 @@ public class AccessibleOLEShape extends TestCase { at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "OLEShape"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "OLEShape"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "OLEShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index bf6b897ed43b..1159431705e5 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePageShape.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.2 $ * * This file is part of OpenOffice.org. * @@ -54,8 +54,8 @@ import com.sun.star.uno.XInterface; public class AccessiblePageShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -100,8 +100,9 @@ public class AccessiblePageShape extends TestCase { at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, - "PageShape"); +// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, +// "PageShape"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "PageShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index e640bedadd61..e55a8cecd1d9 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePresentationGraphicShape.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.2 $ * * This file is part of OpenOffice.org. * @@ -55,8 +55,8 @@ import com.sun.star.uno.XInterface; public class AccessiblePresentationGraphicShape extends TestCase { - XComponent xDoc; - XModel aModel; + static XComponent xDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -124,8 +124,9 @@ public class AccessiblePresentationGraphicShape extends TestCase { XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "GraphicObject"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index e3d50e3fff82..3e77ec54027d 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePresentationOLEShape.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.2 $ * * This file is part of OpenOffice.org. * @@ -55,8 +55,8 @@ import com.sun.star.uno.XInterface; public class AccessiblePresentationOLEShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -133,8 +133,9 @@ public class AccessiblePresentationOLEShape extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "ImpressOLE"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "ImpressOLE"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressOLE"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 6e45d604076e..d271c56cf751 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePresentationShape.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.2 $ * * This file is part of OpenOffice.org. * @@ -55,8 +55,8 @@ import com.sun.star.uno.XInterface; public class AccessiblePresentationShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -120,8 +120,9 @@ public class AccessiblePresentationShape extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "ImpressHandout"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "ImpressHandout"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressHandout"); log.println("Implementation Name: "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index c45d3f50e9a4..0cbbb0a3c5ba 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleShape.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.2 $ * * This file is part of OpenOffice.org. * @@ -54,8 +54,8 @@ import com.sun.star.uno.XInterface; public class AccessibleShape extends TestCase { - XComponent xDrawDoc; - XModel aModel; + static XComponent xDrawDoc; + static XModel aModel; protected void initialize( TestParameters tParam, PrintWriter log ) { @@ -104,8 +104,9 @@ public class AccessibleShape extends TestCase { at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole - (xRoot, AccessibleRole.SHAPE, "Rectangle"); +// oObj = at.getAccessibleObjectForRole +// (xRoot, AccessibleRole.SHAPE, "Rectangle"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Rectangle"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java index 48bbbe169994..0ddba38e3fac 100644 --- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java +++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: GraphicExporter.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -79,7 +79,7 @@ import util.XMLTools; * @see ifc.document._XExporter */ public class GraphicExporter extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * Creates a new draw document. diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index cc7462c365e7..51b8757b72eb 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxDrawPage.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * * This file is part of OpenOffice.org. * @@ -101,7 +101,7 @@ import util.ShapeDsc; * @see ifc.drawing._XShapeCombiner */ public class SvxDrawPage extends TestCase { - XSpreadsheetDocument xDoc = null; + static XSpreadsheetDocument xDoc = null; /** * Creates a new Draw document. diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index 6f5e4cbc4fa1..933395b4784c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxGraphCtrlAccessibleContext.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * * This file is part of OpenOffice.org. * @@ -67,7 +67,7 @@ import com.sun.star.view.XSelectionSupplier; */ public class SvxGraphCtrlAccessibleContext extends TestCase{ - XComponent xDrawDoc = null; + static XComponent xDrawDoc = null; /** * Called to create an instance of <code>TestEnvironment</code> diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java index a76b4aa560f7..bfc1604343fb 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxGraphicObject.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.8.1 $ * * This file is part of OpenOffice.org. * @@ -109,7 +109,7 @@ import com.sun.star.uno.XInterface; */ public class SvxGraphicObject extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * Creates a new Draw document. diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java index fd96bcc22d6f..1cf58ac95f41 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShape.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShape.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -123,7 +123,7 @@ import com.sun.star.uno.XInterface; */ public class SvxShape extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * Loads a Draw document with name 'SvxShape.sxd' from test diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java index aa5f7ced6b82..cfa9e915fe66 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeCircle.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -120,7 +120,7 @@ import com.sun.star.uno.XInterface; */ public class SvxShapeCircle extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * Loads a Draw document with name 'SvxShape.sxd' from test diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java index 1df394afe2cf..e8a48df78b8a 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeCollection.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.8.1 $ * * This file is part of OpenOffice.org. * @@ -50,7 +50,7 @@ import com.sun.star.uno.XInterface; public class SvxShapeCollection extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java index 6e8a8679261d..72d8d30d9c6d 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeConnector.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -77,7 +77,7 @@ import com.sun.star.uno.XInterface; */ public class SvxShapeConnector extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java index 8c1d452ab58f..ca7302cde976 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeControl.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -52,7 +52,7 @@ import com.sun.star.uno.XInterface; public class SvxShapeControl extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 91d6ee89210d..7662f2d8740a 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeDimensioning.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface; public class SvxShapeDimensioning extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index 6af5862fe36f..2234bad89ff5 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapeGroup.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -65,7 +65,7 @@ import com.sun.star.uno.XInterface; public class SvxShapeGroup extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method initializes the document diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index 5141d1e2d1f4..a1c38fd7c4fc 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapePolyPolygon.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -124,7 +124,7 @@ import com.sun.star.uno.XInterface; */ public class SvxShapePolyPolygon extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index a612a7ac0b57..87e20442a35d 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxShapePolyPolygonBezier.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -126,7 +126,7 @@ import com.sun.star.uno.XInterface; */ public class SvxShapePolyPolygonBezier extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java index 19e161d3c82f..c2887ef73188 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoNumberingRules.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -48,7 +48,7 @@ import util.DrawTools; public class SvxUnoNumberingRules extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a drawdoc"); diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java index 30a748070499..d6c8d7937164 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoText.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoText extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java index 345622e836e9..4b5d0671d576 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextContent.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoTextContent extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java index 2dcb483c6fc9..ad5a60d9ff05 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextContentEnum.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.8.1 $ * * This file is part of OpenOffice.org. * @@ -51,7 +51,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoTextContentEnum extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java index 1b3653451787..cc6df28dcb8c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextCursor.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.8.1 $ * * This file is part of OpenOffice.org. * @@ -50,7 +50,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoTextCursor extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java index 531491733950..c4c6ee90faf9 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextField.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.8.1 $ * * This file is part of OpenOffice.org. * @@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface; */ public class SvxUnoTextField extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java index e941019e7081..8d5e008994a2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextRange.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoTextRange extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java index 7d0c96c0b4b6..fac53e9f0deb 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SvxUnoTextRangeEnumeration.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * * This file is part of OpenOffice.org. * @@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface; public class SvxUnoTextRangeEnumeration extends TestCase { - XComponent xDrawDoc; + static XComponent xDrawDoc; /** * in general this method creates a testdocument |