NVDA branch master updated. 94cb37f: Merge branch 't3042'. Fixes #3042

[<nor...@nv...>]

The branch master has been updated
  From 967990b to 94cb37f

New revisions:

- Log -----------------------------------------------------------------
commit 94cb37f0f54130542913259ff096353f92c76b48
Merge: 967990b c176421
Author: Michael Curran <mi...@nv...>
Date:   Fri Nov 1 09:41:02 2013 +1000

    Merge branch 't3042'. Fixes #3042

-----------------------------------------------------------------------

Summary of changes:
 source/NVDAObjects/window/excel.py |   14 +++++++++-----
 user_docs/en/changes.t2t           |    1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/source/NVDAObjects/window/excel.py b/source/NVDAObjects/window/excel.py
index d7277cd..fa6995f 100755
--- a/source/NVDAObjects/window/excel.py
+++ b/source/NVDAObjects/window/excel.py
@@ -276,7 +276,14 @@ class ExcelCell(ExcelBase):
 		self.excelCellObject=excelCellObject
 		super(ExcelCell,self).__init__(windowHandle=windowHandle)
 
-	role=controlTypes.ROLE_TABLECELL
+	def _get_role(self):
+		try:
+			linkCount=self.excelCellObject.hyperlinks.count
+		except (COMError,NameError,AttributeError):
+			linkCount=None
+		if linkCount:
+			return controlTypes.ROLE_LINK
+		return controlTypes.ROLE_TABLECELL
 
 	TextInfo=ExcelCellTextInfo
 
@@ -291,8 +298,6 @@ class ExcelCell(ExcelBase):
 			return False
 		return thisAddr==otherAddr
 
-	name=None
-
 	def _get_cellCoordsText(self):
 		return self.getCellAddress(self.excelCellObject)
 
@@ -312,8 +317,7 @@ class ExcelCell(ExcelBase):
 		ID="%s %s"%(ID,self.windowHandle)
 		return ID
 
-
-	def _get_value(self):
+	def _get_name(self):
 		return self.excelCellObject.Text
 
 	def _get_description(self):
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index a6c5a6e..e808514 100644
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -12,6 +12,7 @@
 - a new 'Allow Skim Reading in Say All' option in the Keyboard settings dialog allows navigating through a document with browse mode quick navigation and line / paragraph movement commands, while remaining in say all. This option is off by default. (#2766) 
 - There is now an Input Gestures dialog to allow simpler customization of the input gestures (such as keys on the keyboard) for NVDA commands. (#1532)
 - You can now have different settings for different situations using configuration profiles. Profiles can be activated manually or automatically (e.g. for a particular application). (#87, #667, #1913)
+- In Microsoft Excel, cells that are links are now announced as links. (#3042)
 
 
 == Bug Fixes ==