Merge 6763873 into a380b6a

michaelweghorn · web-flow · commit 903354ca06b7 · 2023-10-07T02:12:40.000+10:00
diff --git a/source/appModules/soffice.py b/source/appModules/soffice.py
@@ -388,7 +388,13 @@ def searchStatusBar(self, obj: NVDAObject, max_depth: int = 5) -> Optional[NVDAO
 		(up to the given depth) has the corresponding role."""
 		if obj.role == controlTypes.Role.STATUSBAR:
 			return obj
-		if max_depth < 1 or obj.role not in {controlTypes.Role.ROOTPANE, controlTypes.Role.WINDOW}:
+		if max_depth < 1 or obj.role not in {
+			controlTypes.Role.DIALOG,
+			controlTypes.Role.FRAME,
+			controlTypes.Role.OPTIONPANE,
+			controlTypes.Role.ROOTPANE,
+			controlTypes.Role.WINDOW
+		}:
 			return None
 		for child in obj.children:
 			status_bar = self.searchStatusBar(child, max_depth - 1)
@@ -402,9 +408,10 @@ def _get_statusBar(self) -> Optional[NVDAObject]:
 	def getStatusBarText(self, obj: NVDAObject) -> str:
 		text = ""
 		for child in obj.children:
-			textObj = child.IAccessibleTextObject
-			if textObj:
-				if text:
-					text += " "
-				text += textObj.textAtOffset(0, IA2.IA2_TEXT_BOUNDARY_ALL)[2]
+			if hasattr(child, 'IAccessibleTextObject'):
+				textObj = child.IAccessibleTextObject
+				if textObj:
+					if text:
+						text += " "
+					text += textObj.textAtOffset(0, IA2.IA2_TEXT_BOUNDARY_ALL)[2]
 		return text
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -26,6 +26,7 @@ This option now announces additional relevant information about an object when t
 - The SAPI4 synthesizer now properly supports volume, rate and pitch changes embedded in speech. (#15271)
 - Multi line state is now correctly reported in applications using Java Access Bridge. (#14609)
 - In LibreOffice, words deleted using the ``control+backspace`` keyboard shortcut are now also properly announced when the deleted word is followed by whitespace (like spaces and tabs). (#15436)
+- In LibreOffice, announcement of the status bar using the ``NVDA+end`` keyboard shortcut now also works for dialogs and the upcoming LibreOffice version 24.2. (#15591)
 -
 
 == Changes for Developers ==

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ This option now announces additional relevant information about an object when t`
`26`	`26`	`- The SAPI4 synthesizer now properly supports volume, rate and pitch changes embedded in speech. (#15271)`
`27`	`27`	`- Multi line state is now correctly reported in applications using Java Access Bridge. (#14609)`
`28`	`28`	- In LibreOffice, words deleted using the ``control+backspace`` keyboard shortcut are now also properly announced when the deleted word is followed by whitespace (like spaces and tabs). (#15436)
	`29`	+- In LibreOffice, announcement of the status bar using the ``NVDA+end`` keyboard shortcut now also works for dialogs and the upcoming LibreOffice version 24.2. (#15591)
`29`	`30`	`-`
`30`	`31`
`31`	`32`	`== Changes for Developers ==`