diff options
| -rw-r--r-- | src/gui/accessible/qaccessible2_p.h | 6 | ||||
| -rw-r--r-- | src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/accessible/iaccessible2.cpp | 8 |
5 files changed, 11 insertions, 20 deletions
diff --git a/src/gui/accessible/qaccessible2_p.h b/src/gui/accessible/qaccessible2_p.h index 95f93e2431..458e32dd6d 100644 --- a/src/gui/accessible/qaccessible2_p.h +++ b/src/gui/accessible/qaccessible2_p.h @@ -127,12 +127,6 @@ public: virtual int rowIndex() const = 0; // Returns a boolean value indicating whether this cell is selected. virtual bool isSelected() const = 0; - - // Gets the row and column indexes and extents of this cell accessible and whether or not it is selected. - // ### Is this really needed?? - // - // ### Maybe change to QSize cellSize(), we already have accessors for the row, column and selected - virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const = 0; // Returns a reference to the accessbile of the containing table. virtual QAccessibleInterface* table() const = 0; }; diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index d42251d4dd..231576ed01 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -2242,11 +2242,14 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString col = index % cols; QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, col)->tableCellInterface(); if (cell) { - cell->rowColumnExtents(&row, &col, &rowExtents, &colExtents, &isSelected); + row = cell->rowIndex(); + col = cell->columnIndex(); + rowExtents = cell->rowExtent(); + colExtents = cell->columnExtent(); + isSelected = cell->isSelected(); success = true; } } - QVariantList list; list << success << row << col << rowExtents << colExtents << isSelected; connection.send(message.createReply(list)); diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index d460ec2c98..86c7812553 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -1010,15 +1010,6 @@ void QAccessibleTableCell::unselectCell() view->selectionModel()->select(m_index, QItemSelectionModel::Deselect); } -void QAccessibleTableCell::rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const -{ - *row = m_index.row(); - *column = m_index.column(); - *rowExtents = 1; - *columnExtents = 1; - *selected = isSelected(); -} - QAccessibleInterface *QAccessibleTableCell::table() const { return QAccessible::queryAccessibleInterface(view); diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h index 09dacde7a2..72b2339dd3 100644 --- a/src/plugins/accessible/widgets/itemviews.h +++ b/src/plugins/accessible/widgets/itemviews.h @@ -194,7 +194,6 @@ public: virtual QList<QAccessibleInterface*> rowHeaderCells() const; virtual int rowIndex() const; virtual bool isSelected() const; - virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const; virtual QAccessibleInterface* table() const; //action interface diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp index 7a28fd9074..a0f2c1812f 100644 --- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp +++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp @@ -1207,10 +1207,14 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_rowColumnExtents(long *row, { QAccessibleInterface *accessible = accessibleInterface(); accessibleDebugClientCalls(accessible); - if (!accessible) + if (!accessible || !tableCellInterface()) return E_FAIL; - tableCellInterface()->rowColumnExtents((int*)row, (int*)column, (int*)rowExtents, (int*)columnExtents, (bool*)isSelected); + *row = (long)tableCellInterface()->rowIndex(); + *column = (long)tableCellInterface()->columnIndex(); + *rowExtents = (long)tableCellInterface()->rowExtent(); + *columnExtents = (long)tableCellInterface()->columnExtent(); + *isSelected = tableCellInterface()->isSelected(); return S_OK; } |