Merge 7b0a2f6 into 2adb77c

michaelweghorn · web-flow · commit 95627e81a1f7 · 2023-10-03T10:03:41.000+03:00
diff --git a/source/appModules/soffice.py b/source/appModules/soffice.py
@@ -25,6 +25,7 @@
 import speech
 import api
 import braille
+import inputCore
 import languageHandler
 import vision
 
@@ -318,6 +319,43 @@ def _get_locationText(self):
 class SymphonyDocument(CompoundDocument):
 	TextInfo = SymphonyDocumentTextInfo
 
+	# override base class implementation because that one assumes
+	# that the text retrieved from the text info for the text unit
+	# is the same as the text that actually gets removed, which at
+	# least isn't true for Writer paragraphs when removing a word
+	# followed by whitespace using Ctrl+Backspace
+	def _backspaceScriptHelper(self, unit: str, gesture: inputCore.InputGesture):
+		try:
+			oldInfo = self.makeTextInfo(textInfos.POSITION_CARET)
+			if not isinstance(oldInfo, SymphonyDocumentTextInfo):
+				super()._backspaceScriptHelper(unit, gesture)
+				return
+			ia2TextObj = oldInfo._start.obj.IAccessibleTextObject
+			oldCaretOffset = ia2TextObj.caretOffset
+			oldText = ia2TextObj.text(0, ia2TextObj.nCharacters)
+		except NotImplementedError:
+			gesture.send()
+			return
+
+		gesture.send()
+
+		newInfo = self.makeTextInfo(textInfos.POSITION_CARET)
+		ia2TextObj = newInfo._start.obj.IAccessibleTextObject
+		newCaretOffset = ia2TextObj.caretOffset
+		newText = ia2TextObj.text(0, ia2TextObj.nCharacters)
+
+		# double-check check that text between previous and current
+		# caret position was deleted and announce it
+		deletedText = oldText[newCaretOffset:oldCaretOffset]
+		if newText == oldText[0:newCaretOffset] + oldText[oldCaretOffset:]:
+			if len(deletedText) > 1:
+				speech.speakMessage(deletedText)
+			else:
+				speech.speakSpelling(deletedText)
+				self._caretScriptPostMovedHelper(None, gesture, newInfo)
+		else:
+			log.warning('Backspace did not remove text as expected.')
+
 
 class AppModule(appModuleHandler.AppModule):
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -16,6 +16,7 @@ What's New in NVDA
 - The following commands now support two and three presses to spell the reported information and spell with character descriptions: report selection, report clipboard text and report focused object. (#15449)
 - The option "Report role when mouse enters object" in NVDA's mouse settings category has been renamed to "Report object when mouse enters it".
 This option now announces additional relevant information about an object when the mouse enters it, such as states (checked/pressed) or cell coordinates in a table. (#15420)
+- 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)
 -
 
 == Bug Fixes ==

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ What's New in NVDA`
`16`	`16`	`- The following commands now support two and three presses to spell the reported information and spell with character descriptions: report selection, report clipboard text and report focused object. (#15449)`
`17`	`17`	`- The option "Report role when mouse enters object" in NVDA's mouse settings category has been renamed to "Report object when mouse enters it".`
`18`	`18`	`This option now announces additional relevant information about an object when the mouse enters it, such as states (checked/pressed) or cell coordinates in a table. (#15420)`
	`19`	+- 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)
`19`	`20`	`-`
`20`	`21`
`21`	`22`	`== Bug Fixes ==`