orca r3733 - in branches/gnome-2-22: . src/orca/scripts

[richb svn gnome org]

Author: richb
Date: Thu Mar 20 17:17:08 2008
New Revision: 3733
URL: http://svn.gnome.org/viewvc/orca?rev=3733&view=rev

Log:
        * src/orca/scripts/StarOffice.py:
          From Joanmarie Diggs <joanmarie diggs gmail com>
          Work on bug #523459 - oocalc/bug_356334.py regression tests #1
          through #4 produce the wrong results. This patch fixes up the
          numerous bogus "not selected" differences in several oocalc
          regression tests.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/orca/scripts/StarOffice.py

Modified: branches/gnome-2-22/src/orca/scripts/StarOffice.py
==============================================================================
--- branches/gnome-2-22/src/orca/scripts/StarOffice.py	(original)
+++ branches/gnome-2-22/src/orca/scripts/StarOffice.py	Thu Mar 20 17:17:08 2008
@@ -73,6 +73,9 @@
             C. otherwise, the full contents of the cell
         """
 
+        if not self._script.isSpreadSheetCell(obj):
+            return where_am_I.WhereAmI._speakTableCell(self, obj, basicOnly)
+
         utterances = []
         utterances.append(_("cell"))
 
@@ -1264,7 +1267,8 @@
                 # really try to avoid doing this kind of thing, but sometimes
                 # it is necessary and we apologize.
                 #
-                if current.getRole() == pyatspi.ROLE_FRAME and \
+                if current.getRole() in [pyatspi.ROLE_FRAME,
+                                         pyatspi.ROLE_ROOT_PANE] and \
                    (current.name and current.name.endswith(_("Calc"))):
                     found = True
                 current = current.parent