MS Word documents: report when headings are collapsed in both speech and braille.

nvdaHelper/remote/WinWord/Constants.h

@@ -79,6 +79,7 @@ constexpr int wdDISPID_PAGESETUP_PAGEWIDTH = 105;
 constexpr int wdDISPID_PAGESETUP_SECTIONSTART = 114;
 constexpr int wdDISPID_PAGESETUP_TEXTCOLUMNS = 119;
 constexpr int wdDISPID_PARAGRAPH_OUTLINELEVEL = 202;
+constexpr int wdDISPID_PARAGRAPH_COLLAPSED_STATE = 1203;
 constexpr int wdDISPID_PARAGRAPH_RANGE = 0;
 constexpr int wdDISPID_PARAGRAPH_STYLE = 100;
 constexpr int wdDISPID_PARAGRAPHFORMAT_ALIGNMENT = 101;

nvdaHelper/remote/winword.cpp

@@ -304,6 +304,12 @@ int generateHeadingXML(IDispatch* pDispatchParagraph, IDispatch* pDispatchParagr
 	int headingLevel=getHeadingLevelFromParagraph(pDispatchParagraph);
 	if(!headingLevel) return 0;
 	XMLStream<<L"<control role=\"heading\" level=\""<<headingLevel<<L"\" ";
+	// Expose the collapsed state of the heading
+	bool isCollapsed=false;
+	_com_dispatch_raw_propget(pDispatchParagraph, wdDISPID_PARAGRAPH_COLLAPSED_STATE, VT_BOOL, &isCollapsed);
+	if(isCollapsed) {
+		XMLStream<<L"collapsedState=\"true\" ";
+	}
 	if(pDispatchParagraphRange) {
 		long iVal=0;
 		if(_com_dispatch_raw_propget(pDispatchParagraphRange,wdDISPID_RANGE_START,VT_I4,&iVal)==S_OK&&iVal>=startOffset) {

source/NVDAObjects/UIA/wordDocument.py

@@ -490,15 +490,15 @@ def _getFormatFieldAtRange(self, textRange, formatConfig, ignoreMixedValues=Fals
 					)
 					if isinstance(textColumnNumber, int):
 						formatField.field["text-column-number"] = textColumnNumber
-		expandCollapseState = UIARemote.msWord_getCustomAttributeValue(
-			docElement,
-			textRange,
-			UIACustomAttributeID.EXPAND_COLLAPSE_STATE,
-		)
-		if expandCollapseState == EXPAND_COLLAPSE_STATE.COLLAPSED:
-			formatField.field["collapsed"] = True
-		elif expandCollapseState == EXPAND_COLLAPSE_STATE.EXPANDED:
-			formatField.field["collapsed"] = False
+			expandCollapseState = UIARemote.msWord_getCustomAttributeValue(
+				docElement,
+				textRange,
+				UIACustomAttributeID.EXPAND_COLLAPSE_STATE,
+			)
+			if expandCollapseState == EXPAND_COLLAPSE_STATE.COLLAPSED:
+				formatField.field["collapsed"] = True
+			elif expandCollapseState == EXPAND_COLLAPSE_STATE.EXPANDED:
+				formatField.field["collapsed"] = False
 		return formatField
 
 	def _getIndentValueDisplayString(self, val: float) -> str:

source/NVDAObjects/window/winword.py

@@ -1112,6 +1112,11 @@ def _normalizeControlField(self, field):
 				field["name"] = name
 				field["alwaysReportName"] = True
 				field["role"] = controlTypes.Role.FRAME
+		collapsedState = field.pop("collapsedState", None) == "true"
+		if collapsedState:
+			if "states" not in field:
+				field["states"] = set()
+			field["states"].add(controlTypes.State.COLLAPSED)
 		newField = LazyControlField_RowAndColumnHeaderText(self)
 		newField.update(field)
 		return newField

source/braille.py

@@ -1162,8 +1162,7 @@ def getFormatFieldBraille(field, fieldCache, isAtStart, formatConfig):
 				textList.append(_("h%s") % headingLevel)
 		collapsed = field.get("collapsed")
 		if collapsed:
-			# Translators: Displayed in braille for collapsed text
-			textList.append(_("+"))
+			textList.append(positiveStateLabels[controlTypes.State.COLLAPSED])
 	if formatConfig["reportLinks"]:
 		link = field.get("link")
 		oldLink = fieldCache.get("link")

source/speech/speech.py

@@ -2632,9 +2632,7 @@ def getFormatFieldSpeech(  # noqa: C901
 		)
 		or collapsed != oldCollapsed
 	):
-		# Translators: collapsed text (E.g. a collapsed heading in MS Word)
-		text = _("collapsed")
-		textList.append(text)
+		textList.append(State.COLLAPSED.displayString)
 	if formatConfig["reportStyle"]:
 		style = attrs.get("style")
 		oldStyle = attrsCache.get("style") if attrsCache is not None else None

user_docs/en/changes.md

@@ -27,7 +27,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu
 * Automatic language switching is now supported when using Microsoft Speech API version 5 (SAPI5) and Microsoft Speech Platform voices. (#17146, @gexgd0419)
 * NVDA can now be configured to speak the current line or paragraph when navigating with braille navigation keys. (#17053, @nvdaes)
 * In Word, the selection update is now reported when using Word commands to extend or reduce the selection (`f8` or `shift+f8`). (#3293, @CyrilleB79)
-* In Word 16.0.18226 and higher, NVDA will now report if a heading is collapsed in both speech and braille. (#17499)
+* In Microsoft Word 16.0.18226 and higher, NVDA will now report if a heading is collapsed in both speech and braille. (#17499)
 
 ### Changes