Merge 20cb041 into 8d34a18

CyrilleB79 · web-flow · commit b5601d78ba32 · 2022-10-26T07:46:57.000+10:00
diff --git a/source/virtualBuffers/__init__.py b/source/virtualBuffers/__init__.py
@@ -2,7 +2,7 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2007-2022 NV Access Limited, Peter Vágner
+# Copyright (C) 2007-2022 NV Access Limited, Peter Vágner, Cyrille Bougot
 
 import time
 import threading
@@ -671,10 +671,10 @@ def _getNearestTableCell(
 
 		# Cells are grouped by row, so in most cases, we simply need to search in the right direction.
 		for info in self._iterTableCells(tableID, direction=movement, startPos=startPos):
-			_ignore, row, col, rowSpan, colSpan = self._getTableCellCoords(info)
-			if row <= destRow < row + rowSpan and col <= destCol < col + colSpan:
+			cell = self._getTableCellCoords(info)
+			if cell.row <= destRow < cell.row + cell.rowSpan and cell.col <= destCol < cell.col + cell.colSpan:
 				return info
-			elif row > destRow and movement == "next":
+			elif cell.row > destRow and movement == "next":
 				# Optimisation: We've gone forward past destRow, so we know we won't find the cell.
 				# We can't reverse this logic when moving backwards because there might be a prior cell on an earlier row which spans multiple rows.
 				break
@@ -688,8 +688,8 @@ def _getNearestTableCell(
 			# In this case, there might be a cell on an earlier row which spans multiple rows.
 			# Therefore, try searching backwards.
 			for info in self._iterTableCells(tableID, direction="previous", startPos=startPos):
-				_ignore, row, col, rowSpan, colSpan = self._getTableCellCoords(info)
-				if row <= destRow < row + rowSpan and col <= destCol < col + colSpan:
+				cell = self._getTableCellCoords(info)
+				if cell.row <= destRow < cell.row + cell.rowSpan and cell.col <= destCol < cell.col + cell.colSpan:
 					return info
 			else:
 				raise LookupError
