qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 21 ---------- sc/source/ui/Accessibility/AccessibleDocument.cxx | 3 - 2 files changed, 2 insertions(+), 22 deletions(-)
New commits: commit 8f966c402779c4b1578115448b7972ba48e4f294 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 20 15:56:43 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 20 22:10:41 2019 +0200 cid#1448400 UC: Useless code Change-Id: Iad2ec725a8dbc37aeceac3af8611853c910e7d79 Reviewed-on: https://gerrit.libreoffice.org/76023 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 921a45e1a606..e80d6bc8a0ba 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -151,32 +151,13 @@ public class AccessibleBrowseBoxTableCell extends TestCase { the_frame2.setName("DatasourceBrowser"); - XInterface oObj = null; - - 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 = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); - params[1] = param2; - PropertyValue param3 = new PropertyValue(); - param3.Name = "Command"; - param3.Value = "biblio"; - params[2] = param3; - util.utils.waitForEventIdle(tParam.getMSF()); XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); + XInterface oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); log.println("ImplementationName: "+util.utils.getImplName(oObj)); commit e114afa40289f16c14b9591ed97539b7ab673dc6 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 20 16:51:24 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 20 22:10:29 2019 +0200 cid#1451628 Dereference after null check Change-Id: I6ec54ac4568959e70a2d894bf4a564ac1bed627d Reviewed-on: https://gerrit.libreoffice.org/76027 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e947b655a9cb..5f434733a557 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -286,8 +286,7 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, Sc xSelectionSupplier = uno::Reference<view::XSelectionSupplier>(pViewFrame->GetFrame().GetController(), uno::UNO_QUERY); if (xSelectionSupplier.is()) { - if (mpAccessibleDocument) - xSelectionSupplier->addSelectionChangeListener(mpAccessibleDocument); + xSelectionSupplier->addSelectionChangeListener(mpAccessibleDocument); uno::Reference<drawing::XShapes> xShapes(mpViewShell->getSelectedXShapes()); if (xShapes.is()) mnShapesSelected = xShapes->getCount(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
