Merge d1ef0b6 into 78c584f

CyrilleB79 · web-flow · commit f3aaa9c087b5 · 2019-10-02T21:36:38.000Z
diff --git a/nvdaHelper/remote/WinWord/Constants.h b/nvdaHelper/remote/WinWord/Constants.h
@@ -44,6 +44,7 @@ constexpr int wdDISPID_FIELDS_ITEM_TYPE = 1;
 constexpr int wdDISPID_FONT_BOLD = 130;
 constexpr int wdDISPID_FONT_COLOR = 159;
 constexpr int wdDISPID_FONT_DOUBLESTRIKETHROUGH = 136;
+constexpr int wdDISPID_FONT_HIDDEN = 132;
 constexpr int wdDISPID_FONT_ITALIC = 131;
 constexpr int wdDISPID_FONT_NAME = 142;
 constexpr int wdDISPID_FONT_SIZE = 141;
diff --git a/nvdaHelper/remote/winword.cpp b/nvdaHelper/remote/winword.cpp
@@ -645,6 +645,9 @@ void generateXMLAttribsForFormatting(IDispatch* pDispatchRange, int startOffset,
 				} else if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_DOUBLESTRIKETHROUGH,VT_I4,&iVal)==S_OK&&iVal) {
 					formatAttribsStream<<L"strikethrough=\"double\" ";
 				}
+				if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_HIDDEN,VT_I4,&iVal)==S_OK&&iVal) {
+					formatAttribsStream<<L"hidden=\"1\" ";
+				}			
 			}
 		}
 	}
diff --git a/source/speech/__init__.py b/source/speech/__init__.py
@@ -1571,6 +1571,14 @@ def getFormatFieldSpeech(attrs,attrsCache=None,formatConfig=None,reason=None,uni
 				# Translators: Reported when text is not underlined.
 				else _("not underlined"))
 			textList.append(text)
+		hidden = attrs.get("hidden")
+		oldHidden = attrsCache.get("hidden") if attrsCache is not None else None
+		if (hidden or oldHidden is not None) and hidden != oldHidden:
+			# Translators: Reported when text is hidden.
+			text = (_("hidden") if hidden
+				# Translators: Reported when text is not hidden.
+				else _("no hidden"))
+			textList.append(text)
 		textPosition=attrs.get("text-position")
 		oldTextPosition=attrsCache.get("text-position") if attrsCache is not None else None
 		if (textPosition or oldTextPosition is not None) and textPosition!=oldTextPosition:

Original file line number	Diff line number	Diff line change
`@@ -645,6 +645,9 @@ void generateXMLAttribsForFormatting(IDispatch* pDispatchRange, int startOffset,`
`645`	`645`	`} else if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_DOUBLESTRIKETHROUGH,VT_I4,&iVal)==S_OK&&iVal) {`
`646`	`646`	`formatAttribsStream<<L"strikethrough=\"double\" ";`
`647`	`647`	`}`
	`648`	`+ if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_HIDDEN,VT_I4,&iVal)==S_OK&&iVal) {`
	`649`	`+ formatAttribsStream<<L"hidden=\"1\" ";`
	`650`	`+ }`
`648`	`651`	`}`
`649`	`652`	`}`
`650`	`653`	`}`