From 4bf4e3d40778051f1f886c47dd2b2bef82acf1e5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 19 Dec 2014 16:00:53 +0200 Subject: java: no need to instantiate the AccessibilityTools object since all of it's methods and fields are static. Change-Id: Ia2b652969489c5a21e01a35cda65c6e84346aac0 --- qadevOOo/runner/util/AccessibilityTools.java | 2 ++ qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 1 - qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java | 2 +- qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java | 3 --- qadevOOo/tests/java/mod/_basctl/AccessibleShape.java | 2 -- qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java | 2 -- qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 2 -- qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 2 -- qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java | 2 -- qadevOOo/tests/java/mod/_sch/AccArea.java | 2 -- qadevOOo/tests/java/mod/_sch/AccAxis.java | 2 -- qadevOOo/tests/java/mod/_sch/AccDataPoint.java | 2 -- qadevOOo/tests/java/mod/_sch/AccDataSeries.java | 2 -- qadevOOo/tests/java/mod/_sch/AccDiagram.java | 2 -- qadevOOo/tests/java/mod/_sch/AccFloor.java | 2 -- qadevOOo/tests/java/mod/_sch/AccGrid.java | 2 -- qadevOOo/tests/java/mod/_sch/AccLegend.java | 2 -- qadevOOo/tests/java/mod/_sch/AccLegendEntry.java | 2 -- qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 2 -- qadevOOo/tests/java/mod/_sch/AccTitle.java | 2 -- qadevOOo/tests/java/mod/_sch/AccWall.java | 2 -- qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java | 2 -- qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java | 2 -- qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java | 2 -- qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java | 4 +--- qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 2 -- qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java | 1 - qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java | 2 -- qadevOOo/tests/java/mod/_svx/AccessibleShape.java | 2 -- qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java | 2 -- qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 4 ---- qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleList.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java | 2 -- qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java | 2 -- 86 files changed, 4 insertions(+), 171 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index a0f1612845d0..5b75b6db681a 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -34,6 +34,8 @@ public class AccessibilityTools { public static XAccessible SearchedAccessible = null; private static boolean debug = false; + private AccessibilityTools() {} + public static XAccessible getAccessibleObject(XInterface xObject) { return UnoRuntime.queryInterface(XAccessible.class, xObject); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index 484edfdd521c..a9a5b8535e2f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -75,7 +75,6 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { protected boolean clickOnSheet() { log.println("try to open contex menu..."); - new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow(docModel); diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index 7a6b8e8d61a9..053e0df20a4a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -152,7 +152,7 @@ public class _XRangeSelection extends MultiMethodTest { */ protected Point getSheetCenter() { log.println("Trying to get AccessibleSpreadsheet"); - new AccessibilityTools(); + XComponent xSheetDoc = (XComponent) tEnv.getObjRelation("DOCUMENT"); XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index 8399a9d25f09..06c61013f7a2 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -110,8 +110,6 @@ public class _XContextMenuInterception extends MultiMethodTest { XAccessible xRoot = null; - new AccessibilityTools(); - try { xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); @@ -156,7 +154,6 @@ public class _XContextMenuInterception extends MultiMethodTest { private void openContextMenu(XModel xModel){ log.println("try to open contex menu..."); - new AccessibilityTools(); xWindow = AccessibilityTools.getCurrentWindow(xModel); diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java index df8978875df9..5f2d45fbb3a1 100644 --- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java @@ -106,8 +106,6 @@ public class AccessibleShape extends TestCase { throw new StatusException("Couldn't get toolkit", e ); } - new AccessibilityTools(); - final XWindow basicIDE = xFrame.getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(basicIDE); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index 0433837316c0..de651d08862f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -85,8 +85,6 @@ public class ScAccessibleDocument extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index fb6995dbc028..17bcc092f8f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -153,8 +153,6 @@ public class ScAccessibleDocumentPagePreview extends TestCase { Thread.sleep(500); } catch (InterruptedException ex) {} - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index f63df1bbf2db..b6eb255012c0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -135,8 +135,6 @@ public class ScAccessiblePageHeaderArea extends TestCase { Thread.sleep(500); } catch (InterruptedException ex) {} - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index 6ea054549505..9cb809ec022d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -109,8 +109,6 @@ public class ScAccessibleSpreadsheet extends TestCase { XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index c19628bb7ebe..716de219d501 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -61,8 +61,6 @@ public class AccArea extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index b6fb88289b33..456e3b056060 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -61,8 +61,6 @@ public class AccAxis extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index faa126a37364..32b201deb2b4 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -61,8 +61,6 @@ public class AccDataPoint extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index dbb3b05dfdbb..57d8cbbf3466 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -61,8 +61,6 @@ public class AccDataSeries extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 2fb633870748..d6bd1893c3d6 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -61,8 +61,6 @@ public class AccDiagram extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index 7868b3fef8e5..ae4b1a129f13 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -84,8 +84,6 @@ public class AccFloor extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index 207581ff428e..7682b9b248e2 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -61,8 +61,6 @@ public class AccGrid extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index 01b0e091fa84..b9d78b2d6b10 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -61,8 +61,6 @@ public class AccLegend extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 0ef4c0f93845..eee38c452471 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -61,8 +61,6 @@ public class AccLegendEntry extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index 1b9c321b805b..d1cbf720e97b 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -65,8 +65,6 @@ public class AccStatisticsObject extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index d1c7d25eb852..47e57dbce262 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -61,8 +61,6 @@ public class AccTitle extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 4fa43d17b91f..b83f6f2e07c7 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -84,8 +84,6 @@ public class AccWall extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index 9cf450c544cb..cd83ed92aafe 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -49,8 +49,6 @@ public class AccessibleDocumentView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index 6aa6607480d4..68cc9bec0a03 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -98,8 +98,6 @@ public class AccessibleDrawDocumentView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xDrawDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ( aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index 7fe75461aa6b..6d2bfebdcda9 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -64,8 +64,6 @@ public class AccessibleOutlineView extends TestCase { (TestParameters Param, PrintWriter log) { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ( aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index 93e2100209c5..042f6b13fcbe 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -64,12 +64,10 @@ public class AccessibleSlideView extends TestCase { (TestParameters Param, PrintWriter log) { XInterface oObj = null; - new AccessibilityTools(); - XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, aModel); XDrawPages oDPn = oDPS.getDrawPages(); - oDPn.insertNewByIndex(0); + oDPn.insertNewByIndex(0); shortWait(); diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index 9832680274f9..450736072416 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -108,8 +108,6 @@ public class SmEditAccessible extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xMathDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index fd5cf056370a..eabf3fe888e8 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -110,8 +110,6 @@ public class SmGraphicAccessible extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xMathDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 80ae6f99f6c2..6fe1e58b1942 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -150,8 +150,6 @@ public class AccessibleBrowseBox extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index 525d81acaea4..8e540d2e2476 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -196,8 +196,6 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 71178150c73f..5faa71a65272 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -192,8 +192,6 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { throw new StatusException("Could not select Biblio-Database", ex); } - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 42f8e7136f21..8ebb43abe371 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -189,8 +189,6 @@ public class AccessibleBrowseBoxTable extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 34993a1e4d33..98ec82a9699e 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -180,8 +180,6 @@ public class AccessibleBrowseBoxTableCell extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index eec7e20fa3e4..7901d40c6e13 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -203,8 +203,6 @@ public class AccessibleIconChoiceCtrl extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index 1121c00e45d0..3f15454992c1 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -201,8 +201,6 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 4096ac6f70c5..f7843961c7bf 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -101,8 +101,6 @@ public class AccessibleTabBar extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xDoc). diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index 866ab780ea99..2473d4a09724 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -135,8 +135,6 @@ public class AccessibleTabBarPage extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index 38664a09ce90..559b62e65be5 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -136,8 +136,6 @@ public class AccessibleTabBarPageList extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index def0a3354a94..38b826c4d277 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -170,8 +170,6 @@ public class AccessibleTreeListBox extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index cfcff7355b95..8cf434ccc67f 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -225,8 +225,6 @@ public class AccessibleTreeListBoxEntry extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index 55b6903c39ca..6abafcb1d086 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -81,7 +81,6 @@ public class AccessibleControlShape extends TestCase { final XShape oShape = FormTools.insertControlShape (xDrawDoc,3000,4500,15000,1000,"CommandButton"); - new AccessibilityTools(); utils.shortWait(5000); XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index c439f3bab00a..f4fe8173764b 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -63,8 +63,6 @@ public class AccessibleEditableTextPara extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index a75bd7ed03a8..79b94449828d 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -87,8 +87,6 @@ public class AccessibleGraphicShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 0f371ebd4208..16f9d9984737 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -108,8 +108,6 @@ public class AccessibleOLEShape extends TestCase { throw new StatusException("Couldn't change property", e); } - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index d7bd1c2d21fe..6e370f99f771 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -82,8 +82,6 @@ public class AccessiblePageShape extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 97508909dc9a..f0aec37e2538 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -105,8 +105,6 @@ public class AccessiblePresentationGraphicShape extends TestCase { } catch (com.sun.star.beans.UnknownPropertyException e) { } - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index 55565aa08118..16722f2a9040 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -113,8 +113,6 @@ public class AccessiblePresentationOLEShape extends TestCase { } catch (com.sun.star.beans.UnknownPropertyException e) { } - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 88c40b885d74..7a118b5929a9 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -102,8 +102,6 @@ public class AccessiblePresentationShape extends TestCase { "IsEmptyPresentationObject", Boolean.FALSE); } catch (Exception e) {} - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 43a9edd97cd3..84624419d481 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -86,8 +86,6 @@ public class AccessibleShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index 467ec7c41715..d4efa3ee73be 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -131,8 +131,6 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class,oObj); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index 9fcd67c144e4..cbfcce7fd050 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -115,8 +115,6 @@ public class SwAccessibleDocumentPageView extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index a8e70493aa09..dcc6fc889427 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -97,8 +97,6 @@ public class SwAccessibleDocumentView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 651975828ea3..a1858786eb74 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -114,8 +114,6 @@ public class SwAccessibleEndnoteView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 4d70c06cc72a..d48ea8c730b8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -127,8 +127,6 @@ public class SwAccessibleFooterView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index 92621b0ae27e..b487b62d196e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -115,8 +115,6 @@ public class SwAccessibleFootnoteView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 31c24accc71b..b3a8297a4172 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -117,8 +117,6 @@ public class SwAccessibleHeaderView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 9137f9dfc49a..3c32a7cd9b81 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -170,8 +170,6 @@ public class SwAccessiblePageView extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index 89785b805151..adb42c5951ac 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -69,8 +69,6 @@ public class SwAccessibleParagraphView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index 8a972a1322cf..337d0d60a1f4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -83,8 +83,6 @@ public class SwAccessibleTableCellView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index 73e0c5cb4648..9a51003d6501 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -84,8 +84,6 @@ public class SwAccessibleTableView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index da7b10d138f4..e4dbf6202302 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -68,8 +68,6 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 421e3aa9f73a..4692fa0e13d1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -101,8 +101,6 @@ public class SwAccessibleTextFrameView extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index 66a14e7cc89f..73a53f29981e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -90,8 +90,6 @@ public class SwAccessibleTextGraphicObject extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index 2a0e703a1498..da8ddffd0747 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -107,8 +107,6 @@ public class AccessibleButton extends lib.TestCase { util.utils.shortWait(Param.getInt("ShortWait")); - new AccessibilityTools(); - util.utils.shortWait(Param.getInt("ShortWait")); Object atw = tk.getActiveTopWindow(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index 25fa9a7798d3..06d85ac874c0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -129,8 +129,6 @@ public class AccessibleCheckBox extends TestCase { util.utils.shortWait(Param.getInt("ShortWait")); - new AccessibilityTools(); - util.utils.shortWait(Param.getInt("ShortWait")); log.println("Getting the active TopWindow"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index 0174c0094b1d..d7bb63033fbb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -100,10 +100,6 @@ public class AccessibleComboBox extends TestCase { util.utils.shortWait(Param.getInt("ShortWait")); - new AccessibilityTools(); - - util.utils.shortWait(Param.getInt("ShortWait")); - Object atw = tk.getActiveTopWindow(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index 0823bd120f0b..1cdd83a21080 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -74,8 +74,6 @@ public class AccessibleDropDownComboBox extends TestCase { PrintWriter log) { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( xTextDoc); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index 5c76ca502b65..46e1aa1a2063 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -75,8 +75,6 @@ public class AccessibleDropDownListBox extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( xTextDoc); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index d6b547e7ce37..6df7063268bc 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -137,8 +137,6 @@ public class AccessibleEdit extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index 0e73f6b97076..22eab84d3949 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -139,8 +139,6 @@ public class AccessibleFixedText extends TestCase { shortWait(); - new AccessibilityTools(); - XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWinDlg); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java index 1e92248952f5..82a4b8d09ee6 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java @@ -115,8 +115,6 @@ public class AccessibleList extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java index 9a77b694fd86..8a855caa0ed9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java @@ -138,8 +138,6 @@ public class AccessibleListBox extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java index e2f8debccfca..95962691b467 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java @@ -136,8 +136,6 @@ public class AccessibleListItem extends TestCase { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index 0caa8b236dbc..844f96ce76d0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -97,8 +97,6 @@ public class AccessibleMenu extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - new AccessibilityTools(); - XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index 2a595f1e8a86..f0330df7feea 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -73,8 +73,6 @@ public class AccessibleMenuBar extends TestCase { PrintWriter log) { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index 3ed873437632..4b5a9514c5c7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -97,8 +97,6 @@ public class AccessibleMenuItem extends TestCase { shortWait(); - new AccessibilityTools(); - Object atw = tk.getActiveTopWindow(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index 66ea499273fc..0e3d97d05acb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -75,8 +75,6 @@ public class AccessibleMenuSeparator extends TestCase { PrintWriter log) { shortWait(); - new AccessibilityTools(); - XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index 6f165f85017b..335c8994d977 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -142,8 +142,6 @@ public class AccessiblePopupMenu extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( aModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index 3859963faac0..748a64a0496e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -219,8 +219,6 @@ public class AccessibleRadioButton extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - new AccessibilityTools(); - util.utils.shortWait(2000); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index 8b4a2fe1461a..8e1f168044ab 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -142,8 +142,6 @@ public class AccessibleScrollBar extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( aModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index 5d27cb6adf8b..085254e72885 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -134,8 +134,6 @@ public class AccessibleStatusBar extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - final XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index cf6eb04f417a..a6f29e18e0d7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -144,8 +144,6 @@ public class AccessibleStatusBarItem extends TestCase { XInterface oObj = null; XInterface secondItem = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( aModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index 08b35004b883..e89dba8f95a7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -211,8 +211,6 @@ public class AccessibleTabControl extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index 61b4e7dd5665..ae18f9174a8e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -218,8 +218,6 @@ public class AccessibleTabPage extends TestCase { XExtendedToolkit tk = UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - new AccessibilityTools(); - shortWait(); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index 98ccf2e3b132..121295bf5f19 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -136,8 +136,6 @@ public class AccessibleToolBox extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - new AccessibilityTools(); - XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index bd6ff32f6c5d..cc24b53efd15 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -151,8 +151,6 @@ public class AccessibleToolBoxItem extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( aModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index 2853f6873c3e..ab863a7327fa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -157,8 +157,6 @@ public class AccessibleWindow extends TestCase { XInterface oObj = null; - new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( aModel); -- cgit