[orca] Handle tracebacks resulting from Calc crashing



commit 4ce28c16307e0c3d7a9334621fd630a0163ac36a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Sep 11 13:14:20 2015 -0400

    Handle tracebacks resulting from Calc crashing

 src/orca/script_utilities.py                      |    2 +-
 src/orca/scripts/apps/soffice/script_utilities.py |    4 ++--
 src/orca/tutorialgenerator.py                     |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 1121f78..2458a36 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -815,7 +815,7 @@ class Utilities:
             state = obj.getState()
             layoutOnly = not (state.contains(pyatspi.STATE_FOCUSABLE) \
                               or state.contains(pyatspi.STATE_SELECTABLE))
-        elif role == pyatspi.ROLE_PANEL and obj.childCount \
+        elif role == pyatspi.ROLE_PANEL and obj.childCount and firstChild \
              and firstChild.getRole() in ignorePanelParent:
             layoutOnly = True
         elif obj.childCount == 1 and obj.name and obj.name == firstChild.name:
diff --git a/src/orca/scripts/apps/soffice/script_utilities.py 
b/src/orca/scripts/apps/soffice/script_utilities.py
index 473bfba..16d68f4 100644
--- a/src/orca/scripts/apps/soffice/script_utilities.py
+++ b/src/orca/scripts/apps/soffice/script_utilities.py
@@ -227,8 +227,8 @@ class Utilities(script_utilities.Utilities):
         parent = obj.parent
         try:
             parentTable = parent.queryTable()
-        except NotImplementedError:
-            parentTable = None
+        except:
+            return [-1, -1]
 
         startIndex = 0
         endIndex = parentTable.nColumns
diff --git a/src/orca/tutorialgenerator.py b/src/orca/tutorialgenerator.py
index 5c17ab7..6150248 100644
--- a/src/orca/tutorialgenerator.py
+++ b/src/orca/tutorialgenerator.py
@@ -613,7 +613,7 @@ class TutorialGenerator:
         if (not alreadyFocused):
             try:
                 parent_table = obj.parent.queryTable()
-            except NotImplementedError:
+            except:
                 parent_table = None
             if settings.readTableCellRow and parent_table \
                 and not self._script.utilities.isLayoutOnly(obj.parent):
@@ -774,7 +774,7 @@ class TutorialGenerator:
         if not settings.enableTutorialMessages:
             return []
 
-        if not obj == orca_state.locusOfFocus:
+        if not (obj and obj == orca_state.locusOfFocus):
             return []
 
         utterances = []


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