[orca] Don't generate old ancestors when entering Calc input line



commit 23e522d96e5f64d6b5bb4df4f314be658a6272a9
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Feb 17 08:53:30 2016 -0500

    Don't generate old ancestors when entering Calc input line

 src/orca/scripts/apps/soffice/speech_generator.py |    2 +-
 src/orca/speech_generator.py                      |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/apps/soffice/speech_generator.py 
b/src/orca/scripts/apps/soffice/speech_generator.py
index 677548b..a2a99b9 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -448,7 +448,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         if not priorObj:
             return []
 
-        if obj.getRoleName() == 'text frame':
+        if self._script.utilities.isSpreadSheetCell(priorObj):
             return []
 
         isTable = lambda x: x and x.getRole() == pyatspi.ROLE_TABLE
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index b525a7f..125b30d 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -931,7 +931,9 @@ class SpeechGenerator(generator.Generator):
         if self._script.utilities.isLastCell(obj):
             result = [messages.TABLE_END]
             result.extend(self.voice(SYSTEM))
-        return result
+            return result
+
+        return []
 
     #####################################################################
     #                                                                   #


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]