Merge 377ac92 into 9cf9251

michaelweghorn · web-flow · commit 6cccd5dc1010 · 2023-12-06T00:27:55.000+10:00
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -1485,6 +1485,8 @@ def _get_positionInfo(self):
 			try:
 				info={}
 				info["level"],info["similarItemsInGroup"],info["indexInGroup"]=self.IAccessibleObject.groupPosition
+				if not info["level"]:
+					info["level"] = self.IA2Attributes["level"]
 				# Object's with an IAccessibleTableCell interface should not expose indexInGroup/similarItemsInGroup as the cell's 2d info is much more useful.
 				if self._IATableCell:
 					del info['indexInGroup']
diff --git a/source/appModules/soffice.py b/source/appModules/soffice.py
@@ -222,6 +222,9 @@ class SymphonyText(IAccessible, EditableText):
 	TextInfo = SymphonyTextInfo
 
 	def _get_positionInfo(self):
+		# LibreOffice versions >= 5.0 report the "level" attribute that's
+		# handled in the base class, but Apache OpenOffice doesn't,
+		# so check for the custom "heading-level" attribute first
 		level = self.IA2Attributes.get("heading-level")
 		if level:
 			return {"level": int(level)}
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -88,6 +88,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e
   - Announcement of the status bar using the ``NVDA+end`` keyboard shortcut now also works for dialogs in LibreOffice version 24.2 and newer. (#15591, @michaelweghorn)
   - All expected text attributes are now supported in LibreOffice versions 24.2 and above.
   This makes the announcement of spelling errors work when announcing a line in Writer. (#15648, @michaelweghorn)
+  - Announcement of heading levels now also works for LibreOffice versions 24.2 and newer. (#15881, @michaelweghorn)
   -
 - Microsoft Office:
   - In Excel with UIA disabled, braille is updated, and the active cell content is spoken, when ``control+y``, ``control+z`` or ``alt+backspace`` is pressed. (#15547)

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e`
`88`	`88`	- Announcement of the status bar using the ``NVDA+end`` keyboard shortcut now also works for dialogs in LibreOffice version 24.2 and newer. (#15591, @michaelweghorn)
`89`	`89`	`- All expected text attributes are now supported in LibreOffice versions 24.2 and above.`
`90`	`90`	`This makes the announcement of spelling errors work when announcing a line in Writer. (#15648, @michaelweghorn)`
	`91`	`+ - Announcement of heading levels now also works for LibreOffice versions 24.2 and newer. (#15881, @michaelweghorn)`
`91`	`92`	`-`
`92`	`93`	`- Microsoft Office:`
`93`	`94`	- In Excel with UIA disabled, braille is updated, and the active cell content is spoken, when ``control+y``, ``control+z`` or ``alt+backspace`` is pressed. (#15547)