adobeAcrobat vbuf backend: Handle Th Scope attribute values Row and C…

…olumn. Fixes #2527.
nvaccess · Jul 13, 2012 · 16ae56d · 16ae56d
1 parent 67f5c30
commit 16ae56d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/nvdaHelper/vbufBackends/adobeAcrobat/adobeAcrobat.cpp b/nvdaHelper/vbufBackends/adobeAcrobat/adobeAcrobat.cpp
@@ -496,7 +496,13 @@ AdobeAcrobatVBufStorage_controlFieldNode_t* AdobeAcrobatVBufBackend_t::fillVBuf(
 			}
 		}
 		if (role == ROLE_SYSTEM_COLUMNHEADER || role == ROLE_SYSTEM_ROWHEADER) {
-			if (role == ROLE_SYSTEM_COLUMNHEADER) {
+			bool isColHeader;
+			if (domElement && domElement->GetAttribute(L"Scope", L"Table", &tempBstr) == S_OK && tempBstr) {
+				isColHeader = wcscmp(tempBstr, L"Column") == 0;
+				SysFreeString(tempBstr);
+			} else
+				isColHeader = role == ROLE_SYSTEM_COLUMNHEADER;
+			if (isColHeader) {
 				// Record this as a column header for each spanned column.
 				s.str(L"");
 				s << docHandle << L"," << ID << L";";
@@ -513,7 +519,7 @@ AdobeAcrobatVBufStorage_controlFieldNode_t* AdobeAcrobatVBufBackend_t::fillVBuf(
 				// Record the id string and associated header info for use when handling explicitly defined headers.
 				TableHeaderInfo& headerInfo = tableInfo->headersInfo[tempBstr];
 				headerInfo.uniqueId = ID;
-				headerInfo.isColumnHeader = role == ROLE_SYSTEM_COLUMNHEADER;
+				headerInfo.isColumnHeader = isColHeader;
 				SysFreeString(tempBstr);
 			}
 		}

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -12,7 +12,7 @@
 - When Windows 8 Toast notifications appear, NVDA will announce them and move the navigator object there for further interaction. (#2143)
 - Support for VIP Mud. (#1728)
 - In Adobe Reader, if a table has a summary, it is now presented. (#2465)
-- In Adobe Reader, table row and column headers can now be reported. (#2193)
+- In Adobe Reader, table row and column headers can now be reported. (#2193, #2527)
 - New languages: Korean, Nepali
 - NVDA can now read auto complete suggestions when entering email addresses in Microsoft Outlook 2007. (#689)