incubates #6889

Fixes #6889 and #3044 Merge branch 'i6889-fixExcelMergedCellRegression' into next
nvaccess · Feb 20, 2017 · f60d783 · f60d783
2 parents 02d8767 + 46a5676
commit f60d783
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/source/NVDAObjects/window/excel.py b/source/NVDAObjects/window/excel.py
@@ -988,10 +988,18 @@ def _getFormatFieldAndOffsets(self,offset,formatConfig,calculateOffsets=True):
 			except COMError:
 				pass
 		if formatConfig["reportBorderStyle"]:
-			if self.obj.excelCellObject.mergeCells:
-				cellObj=self.obj.excelCellObject.mergeArea.DisplayFormat
+			borders = None
+			hasMergedCells = self.obj.excelCellObject.mergeCells
+			if hasMergedCells:
+				mergeArea = self.obj.excelCellObject.mergeArea
+				try:
+					borders = mergeArea.DisplayFormat.borders # for later versions of office
+				except COMError:
+					borders = mergeArea.borders # for office 2007
+			else:
+				borders = cellObj.borders
 			try:
-				formatField['border-style']=getCellBorderStyleDescription(cellObj.borders,reportBorderColor=formatConfig['reportBorderColor'])
+				formatField['border-style']=getCellBorderStyleDescription(borders,reportBorderColor=formatConfig['reportBorderColor'])
 			except COMError:
 				pass
 		return formatField,(self._startOffset,self._endOffset)