diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2012-09-28 19:22:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-03 17:34:38 +0200 |
| commit | 26022a4eee1041afc22b50c2786c8690c8f98c07 (patch) | |
| tree | c8a0c8565902462134c18ad7aa76f3225f029acb /src/plugins | |
| parent | 2e99f6c48f003b39e8ee4509ee1a7ede5471b38f (diff) | |
Check for valid model and view in isValid for TableCells.
Change-Id: Iadca5503ed2a1d6411d46ed6fe9d5b9a56461a3a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index b3f0dc2a84..d4cfa8c823 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -713,7 +713,7 @@ void QAccessibleTableCell::setText(QAccessible::Text /*t*/, const QString &text) bool QAccessibleTableCell::isValid() const { - return m_index.isValid(); + return view && view->model() && m_index.isValid(); } QAccessibleInterface *QAccessibleTableCell::parent() const @@ -799,7 +799,8 @@ void QAccessibleTableHeaderCell::setText(QAccessible::Text, const QString &) bool QAccessibleTableHeaderCell::isValid() const { - return true; + return view && view->model() && (index > 0) + && ((orientation == Qt::Horizontal) ? (index < view->model()->columnCount()) : (index < view->model()->rowCount())); } QAccessibleInterface *QAccessibleTableHeaderCell::parent() const |