Merge fc6d204 into f436d4d

lukaszgo1 · web-flow · commit 7cfc6ccda0b1 · 2020-05-01T06:52:44.000+10:00
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -2026,6 +2026,8 @@ def _get_value(self):
 	("AkelEditW",oleacc.ROLE_SYSTEM_CLIENT):"akelEdit.AkelEdit",
 	("AkelEditA",oleacc.ROLE_SYSTEM_CLIENT):"akelEdit.AkelEdit",
 	("MSOUNISTAT",oleacc.ROLE_SYSTEM_CLIENT):"msOffice.MSOUNISTAT",
+	("NetUIHWND", oleacc.ROLE_SYSTEM_PROPERTYPAGE): "msOffice.StatusBar",
+	("NetUIHWND", oleacc.ROLE_SYSTEM_TOOLBAR): "msOffice.RibbonSection",
 	("QWidget",oleacc.ROLE_SYSTEM_CLIENT):"qt.Client",
 	("QWidget",oleacc.ROLE_SYSTEM_LIST):"qt.Container",
 	("Qt5QWindowIcon",oleacc.ROLE_SYSTEM_LIST):"qt.Container",
diff --git a/source/NVDAObjects/IAccessible/msOffice.py b/source/NVDAObjects/IAccessible/msOffice.py
@@ -1,8 +1,8 @@
-#NVDAObjects/IAccessible/msOffice.py
-#A part of NonVisual Desktop Access (NVDA)
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
-#Copyright (C) 2006-2010 Michael Curran <mick@kulgan.net>, James Teh <jamie@jantrid.net>
+# -*- coding: UTF-8 -*-
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2006-2020 NV Access Limited, Manish Agrawal, Łukasz Golonka
+# This file may be used under the terms of the GNU General Public License, version 2 or later.
+# For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 
 import oleacc
 import IAccessibleHandler
@@ -180,3 +180,36 @@ def script_selectGraphic(self, gesture):
 		"kb:leftArrow": "selectGraphic",
 		"kb:rightArrow": "selectGraphic",
 	}
+
+
+class StatusBar (IAccessible):
+
+	def _get_role(self):
+		""" #4257: Status bar in Office applications does not  expose proper role via IAccessible.
+We cannot acces it via UIA because it does not fire focus events when focused for the first time.
+Fortunately accValue contains "status bar" and is not localized.
+"""
+		accValue = self.IAccessibleObject.accValue(self.IAccessibleChildID)
+		if accValue == 'Ribbon Tab':
+			return controlTypes.ROLE_TAB
+		if accValue == 'Status Bar':
+			return controlTypes.ROLE_STATUSBAR
+		return super()._get_role()
+
+	def _get_description(self):
+		return ""
+
+	def _get_isPresentableFocusAncestor(self):
+		accValue = self.IAccessibleObject.accValue(self.IAccessibleChildID)
+		if accValue == "Ribbon":
+			return False
+		return super().isPresentableFocusAncestor
+
+
+class RibbonSection (IAccessible):
+
+	def _get_role(self):
+		accValue = self.IAccessibleObject.accValue(self.IAccessibleChildID)
+		if accValue == "Group":
+			return controlTypes.ROLE_GROUPING
+		return super()._get_role()
diff --git a/source/_UIAHandler.py b/source/_UIAHandler.py
@@ -538,6 +538,24 @@ def _isUIAWindowHelper(self,hwnd):
 		# allow the appModule for the window to also choose if this window is bad
 		if appModule and appModule.isBadUIAWindow(hwnd):
 			return False
+		if windowClass == "NetUIHWND":
+			# NetUIHWND is used for various controls in MS Office.
+			# IAccessible should be used for NetUIHWND in versions older than 2016
+			# Fixes: lack of focus reporting (#4207),
+			# Fixes: strange reporting of context menu items(#9252),
+			# fixes: not being able to report ribbon sections when they starts with an edit  field (#7067)
+			# Note that #7067 is not fixed for Office 2016 and never.
+			# Using IAccessible for NetUIHWND controls causes focus changes not to be reported when the ribbon is collabsed.
+			# Testing shows that these controls emits proper events but they are ignored by NVDA.
+			if(
+				appModule.productName.startswith(("Microsoft Office", "Microsoft Outlook"))
+				and int(appModule.productVersion.split(".")[0]) < 16
+			):
+				parentHwnd = winUser.getAncestor(hwnd, winUser.GA_PARENT)
+				while parentHwnd:
+					if winUser.getClassName(parentHwnd) in ("Net UI Tool Window", "MsoCommandBar",):
+						return False
+					parentHwnd = winUser.getAncestor(parentHwnd, winUser.GA_PARENT)
 		# Ask the window if it supports UIA natively
 		res=windll.UIAutomationCore.UiaHasServerSideProvider(hwnd)
 		if res:
