orca r3638 - in branches/gnome-2-22: . src/orca

[joanied svn gnome org]

Author: joanied
Date: Mon Feb 25 21:50:59 2008
New Revision: 3638
URL: http://svn.gnome.org/viewvc/orca?rev=3638&view=rev

Log:
* src/orca/speechgenerator.py:
  src/orca/default.py:
  src/orca/braillegenerator.py:
  Fix for bug #518518 - Need to do some sanity checks for broken
  table hierarchies.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/orca/braillegenerator.py
   branches/gnome-2-22/src/orca/default.py
   branches/gnome-2-22/src/orca/speechgenerator.py

Modified: branches/gnome-2-22/src/orca/braillegenerator.py
==============================================================================
--- branches/gnome-2-22/src/orca/braillegenerator.py	(original)
+++ branches/gnome-2-22/src/orca/braillegenerator.py	Mon Feb 25 21:50:59 2008
@@ -1320,6 +1320,12 @@
                 focusRowRegion = None
                 for i in range(0, table.nColumns):
                     cell = table.getAccessibleAt(row, i)
+                    if not cell:
+                        debug.println(debug.LEVEL_WARNING,
+                             "ERROR: braillegenerator." \
+                             + "_getBrailleRegionsForTableCellRow" \
+                             + " no accessible at (%d, %d)" % (row, i))
+                        continue
                     state = cell.getState()
                     showing = state.contains(pyatspi.STATE_SHOWING)
                     if showing:

Modified: branches/gnome-2-22/src/orca/default.py
==============================================================================
--- branches/gnome-2-22/src/orca/default.py	(original)
+++ branches/gnome-2-22/src/orca/default.py	Mon Feb 25 21:50:59 2008
@@ -2518,7 +2518,8 @@
         - newLocusOfFocus: Accessible that is the new locus of focus
         """
 
-        if newLocusOfFocus.getState().contains(pyatspi.STATE_DEFUNCT):
+        if newLocusOfFocus \
+           and newLocusOfFocus.getState().contains(pyatspi.STATE_DEFUNCT):
             return
 
         try:

Modified: branches/gnome-2-22/src/orca/speechgenerator.py
==============================================================================
--- branches/gnome-2-22/src/orca/speechgenerator.py	(original)
+++ branches/gnome-2-22/src/orca/speechgenerator.py	Mon Feb 25 21:50:59 2008
@@ -1446,6 +1446,12 @@
                 if speakAll:
                     for i in range(0, parent_table.nColumns):
                         cell = parent_table.getAccessibleAt(row, i)
+                        if not cell:
+                            debug.println(debug.LEVEL_WARNING,
+                                 "ERROR: speechgenerator." \
+                                 + "_getSpeechForTableCellRow" \
+                                 + " no accessible at (%d, %d)" % (row, i))
+                            continue
                         state = cell.getState()
                         showing = state.contains(pyatspi.STATE_SHOWING)
                         if showing: