Merge d71cb28 into e8cde2c

CyrilleB79 · web-flow · commit c6985ae90e68 · 2020-04-11T02:35:16.000+10:00
diff --git a/nvdaHelper/remote/winword.cpp b/nvdaHelper/remote/winword.cpp
@@ -51,8 +51,9 @@ constexpr int formatConfig_reportRevisions = 0x8000;
 constexpr int formatConfig_reportParagraphIndentation = 0x10000;
 constexpr int formatConfig_includeLayoutTables = 0x20000;
 constexpr int formatConfig_reportLineSpacing = 0x40000;
+constexpr int formatConfig_reportSuperscriptsAndSubscripts = 0x80000;
 
-constexpr int formatConfig_fontFlags =(formatConfig_reportFontName|formatConfig_reportFontSize|formatConfig_reportFontAttributes|formatConfig_reportColor);
+constexpr int formatConfig_fontFlags =(formatConfig_reportFontName|formatConfig_reportFontSize|formatConfig_reportFontAttributes|formatConfig_reportColor|formatConfig_reportSuperscriptsAndSubscripts);
 constexpr int formatConfig_initialFormatFlags =(formatConfig_reportPage|formatConfig_reportLineNumber|formatConfig_reportTables|formatConfig_reportHeadings|formatConfig_includeLayoutTables);
 
 constexpr wchar_t PAGE_BREAK_VALUE = L'\x0c';
@@ -625,7 +626,7 @@ void generateXMLAttribsForFormatting(IDispatch* pDispatchRange, int startOffset,
 			if((formatConfig&formatConfig_reportColor)&&(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_COLOR,VT_I4,&iVal)==S_OK)) {
 				formatAttribsStream<<L"color=\""<<iVal<<L"\" ";
 			}
-			if(formatConfig&formatConfig_reportFontAttributes) {
+			if(formatConfig&formatConfig_reportFontAttributes) {if(formatConfig&formatConfig_reportFontAttributes) {
 				if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_BOLD,VT_I4,&iVal)==S_OK&&iVal) {
 					formatAttribsStream<<L"bold=\"1\" ";
 				}
@@ -635,11 +636,6 @@ void generateXMLAttribsForFormatting(IDispatch* pDispatchRange, int startOffset,
 				if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_UNDERLINE,VT_I4,&iVal)==S_OK&&iVal) {
 					formatAttribsStream<<L"underline=\"1\" ";
 				}
-				if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_SUPERSCRIPT,VT_I4,&iVal)==S_OK&&iVal) {
-					formatAttribsStream<<L"text-position=\"super\" ";
-				} else if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_SUBSCRIPT,VT_I4,&iVal)==S_OK&&iVal) {
-					formatAttribsStream<<L"text-position=\"sub\" ";
-				}
 				if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_STRIKETHROUGH,VT_I4,&iVal)==S_OK&&iVal) {
 					formatAttribsStream<<L"strikethrough=\"1\" ";
 				} else if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_DOUBLESTRIKETHROUGH,VT_I4,&iVal)==S_OK&&iVal) {
@@ -649,6 +645,13 @@ void generateXMLAttribsForFormatting(IDispatch* pDispatchRange, int startOffset,
 					formatAttribsStream<<L"hidden=\"1\" ";
 				}			
 			}
+			if(formatConfig&formatConfig_reportSuperscriptsAndSubscripts) {
+			    if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_SUPERSCRIPT,VT_I4,&iVal)==S_OK&&iVal) {
+					formatAttribsStream<<L"text-position=\"super\" ";
+				} else if(_com_dispatch_raw_propget(pDispatchFont,wdDISPID_FONT_SUBSCRIPT,VT_I4,&iVal)==S_OK&&iVal) {
+					formatAttribsStream<<L"text-position=\"sub\" ";
+				}
+			}
 		}
 	}
 	if (formatConfig&formatConfig_reportLanguage) {
diff --git a/source/NVDAObjects/window/winword.py b/source/NVDAObjects/window/winword.py
@@ -327,6 +327,7 @@
 	"reportRevisions":0x8000,
 	"reportParagraphIndentation":0x10000,
 	"reportLineSpacing":0x40000,
+	"reportSuperscriptsAndSubscripts":0x80000,
 }
 formatConfigFlag_includeLayoutTables=0x20000
 

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@`
`327`	`327`	`"reportRevisions":0x8000,`
`328`	`328`	`"reportParagraphIndentation":0x10000,`
`329`	`329`	`"reportLineSpacing":0x40000,`
	`330`	`+ "reportSuperscriptsAndSubscripts":0x80000,`
`330`	`331`	`}`
`331`	`332`	`formatConfigFlag_includeLayoutTables=0x20000`
`332`	`333`