diff options
Diffstat (limited to 'qadevOOo/tests/java/mod/_sw')
12 files changed, 15 insertions, 39 deletions
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index 2bf763e48344..d116123e78cd 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -121,9 +121,7 @@ public class SwAccessibleDocumentPageView extends TestCase { XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index b48a85f1438d..cb512e761511 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -102,9 +102,7 @@ public class SwAccessibleDocumentView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index fee79ae2df41..4aa5c4be7351 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -118,9 +118,7 @@ public class SwAccessibleEndnoteView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 439a9dfa28fa..736639c0a987 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -132,9 +132,7 @@ public class SwAccessibleFooterView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index 4a1c92123fc0..ec2a1db402f1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -119,9 +119,7 @@ public class SwAccessibleFootnoteView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 5443b1966fb3..9d51b5c5db79 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -122,9 +122,7 @@ public class SwAccessibleHeaderView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); - - oObj = AccessibilityTools.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index a6b7d154b20e..63988cfb5830 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -74,9 +74,7 @@ public class SwAccessibleParagraphView extends TestCase { XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index 2404af5bbbd8..573b0ca94f39 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -30,6 +30,7 @@ import util.utils; import com.sun.star.accessibility.AccessibleRole; import com.sun.star.accessibility.XAccessible; +import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.accessibility.XAccessibleSelection; import com.sun.star.awt.XWindow; import com.sun.star.frame.XModel; @@ -37,7 +38,6 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.XTextDocument; import com.sun.star.text.XTextTable; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; /** @@ -65,7 +65,7 @@ public class SwAccessibleTableCellView extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XInterface oObj = null; + XAccessibleContext oObj = null; XTextTable oTable = null; SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); @@ -94,9 +94,7 @@ public class SwAccessibleTableCellView extends TestCase { XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -105,7 +103,7 @@ public class SwAccessibleTableCellView extends TestCase { final XAccessibleSelection accSel = UnoRuntime.queryInterface( XAccessibleSelection.class, - at.SearchedContext.getAccessibleParent()); + oObj.getAccessibleParent()); tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index 184814c677e0..e20761c837a4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -95,9 +95,7 @@ public class SwAccessibleTableView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index e5c17767d6fc..d805a5afbdaa 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -73,9 +73,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 8c78416a9160..977e8482faec 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -106,9 +106,7 @@ public class SwAccessibleTextFrameView extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index a1f1ae213599..765778b9e3c2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -95,9 +95,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); - - oObj = at.SearchedContext; + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); |