Merge d748d3e into e38b5b4

LeonarddeR · web-flow · commit e8d924577469 · 2021-09-16T22:08:36.000+10:00
diff --git a/source/_UIAHandler.py b/source/_UIAHandler.py
@@ -756,7 +756,9 @@ def _isUIAWindowHelper(self,hwnd):
 			canUseOlderInProcessApproach = bool(appModule.helperLocalBindingHandle)
 			isOfficeApp = appModule.productName.startswith(("Microsoft Office", "Microsoft Outlook"))
 			if (
-				(
+				# An MS Word document window
+				windowClass == "_WwG"
+				and (
 					winVersion.getWinVer() < winVersion.WIN10
 					or (
 						# An MS Office app before build 13901
@@ -767,8 +769,6 @@ def _isUIAWindowHelper(self,hwnd):
 						)
 					)
 				)
-				# An MS Word document window
-				and windowClass == "_WwG"
 				# Disabling is only useful if we can inject in-process (and use our older code)
 				and canUseOlderInProcessApproach
 				# Allow the user to still explicitly force UIA support

Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,9 @@ def _isUIAWindowHelper(self,hwnd):`
`756`	`756`	`canUseOlderInProcessApproach = bool(appModule.helperLocalBindingHandle)`
`757`	`757`	`isOfficeApp = appModule.productName.startswith(("Microsoft Office", "Microsoft Outlook"))`
`758`	`758`	`if (`
`759`		`- (`
	`759`	`+ # An MS Word document window`
	`760`	`+ windowClass == "_WwG"`
	`761`	`+ and (`
`760`	`762`	`winVersion.getWinVer() < winVersion.WIN10`
`761`	`763`	`or (`
`762`	`764`	`# An MS Office app before build 13901`
`@@ -767,8 +769,6 @@ def _isUIAWindowHelper(self,hwnd):`
`767`	`769`	`)`
`768`	`770`	`)`
`769`	`771`	`)`
`770`		`- # An MS Word document window`
`771`		`- and windowClass == "_WwG"`
`772`	`772`	`# Disabling is only useful if we can inject in-process (and use our older code)`
`773`	`773`	`and canUseOlderInProcessApproach`
`774`	`774`	`# Allow the user to still explicitly force UIA support`