Merge 6a790d8 into 396ca1f

CyrilleB79 · web-flow · commit 431c162634f4 · 2024-11-06T16:09:14.000+11:00
diff --git a/source/NVDAObjects/window/_msOffice.py b/source/NVDAObjects/window/_msOffice.py
@@ -0,0 +1,16 @@
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2024 NV Access Limited, Cyrille Bougot
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
+
+from enum import IntEnum
+
+
+class MsoHyperlink(IntEnum):
+	"""Enumeration of hyperlink types in the Microsoft Office object model.
+	See https://learn.microsoft.com/en-us/office/vba/api/office.msohyperlinktype
+	"""
+
+	RANGE = 0
+	SHAPE = 1
+	INLINE_SHAPE = 2
diff --git a/source/NVDAObjects/window/excel.py b/source/NVDAObjects/window/excel.py
@@ -51,6 +51,7 @@
 from utils.displayString import DisplayStringIntEnum
 import NVDAState
 from globalCommands import SCRCAT_SYSTEMCARET
+from ._msOffice import MsoHyperlink
 
 excel2010VersionMajor = 14
 
@@ -1367,6 +1368,21 @@ def _getFormatFieldAndOffsets(self, offset, formatConfig, calculateOffsets=True)
 	def _get_locationText(self):
 		return self.obj.getCellPosition()
 
+	def _getLinkDataAtCaretPosition(self) -> textInfos._Link | None:
+		links = self.obj.excelCellObject.Hyperlinks
+		if links.count == 0:
+			return None
+		link = links(1)
+		if link.Type == MsoHyperlink.RANGE:
+			text = link.TextToDisplay
+		else:
+			log.debugWarning(f"No text to display for link type {link.Type}")
+			text = None
+		return textInfos._Link(
+			displayText=text,
+			destination=link.Address,
+		)
+
 
 NVCELLINFOFLAG_ADDRESS = 0x1
 NVCELLINFOFLAG_TEXT = 0x2
diff --git a/source/NVDAObjects/window/winword.py b/source/NVDAObjects/window/winword.py
@@ -41,6 +41,7 @@
 from . import Window
 from ..behaviors import EditableTextWithoutAutoSelectDetection
 from . import _msOfficeChart
+from ._msOffice import MsoHyperlink
 import locationHelper
 from enum import IntEnum
 import documentBase
@@ -82,13 +83,6 @@
 wdMaximumNumberOfColumns = 18
 
 
-class MsoHyperlink(IntEnum):
-	# See https://learn.microsoft.com/en-us/office/vba/api/office.msohyperlinktype
-	RANGE = 0
-	SHAPE = 1
-	INLINE_SHAPE = 2
-
-
 class WdUnderline(DisplayStringIntEnum):
 	# Word underline styles
 	# see https://docs.microsoft.com/en-us/office/vba/api/word.wdunderline
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -59,7 +59,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu
 * When spelling, unicode normalization now works more appropriately:
   * After reporting a normalized character, NVDA no longer incorrectly reports subsequent characters as normalized. (#17286, @LeonarddeR)
   * Composite characters (such as é) are now reported correctly. (#17295, @LeonarddeR)
-* In Word or Outlook, when using legacy object model, the command to report the destination URL of a link does not report any longer "Not a link" when there is one to report. (#17292, @CyrilleB79)
+* The command to Report the destination URL of a link now works as expected when using the legacy object model in Microsoft Word, Outlook and Excel. (#17292, #17362, @CyrilleB79)
 
 ### Changes for Developers
 
