orca r4307 - in branches/gnome-2-24: . src/orca/scripts/apps/soffice

[joanied svn gnome org]

Author: joanied
Date: Sat Oct 25 17:54:27 2008
New Revision: 4307
URL: http://svn.gnome.org/viewvc/orca?rev=4307&view=rev

Log:
* src/orca/scripts/apps/soffice/script.py:
  Fix for bug #357545 - Orca does not speak all buttons in openoffice
  database table creation wizard.



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/orca/scripts/apps/soffice/script.py

Modified: branches/gnome-2-24/src/orca/scripts/apps/soffice/script.py
==============================================================================
--- branches/gnome-2-24/src/orca/scripts/apps/soffice/script.py	(original)
+++ branches/gnome-2-24/src/orca/scripts/apps/soffice/script.py	Sat Oct 25 17:54:27 2008
@@ -2092,6 +2092,23 @@
             default.Script.getTextAttributes(self, acc, offset, get_defaults)
         return rv, start, end - 1
 
+    def getDisplayedText(self, obj):
+        """Returns the text being displayed for an object. Overridden here
+        because OpenOffice uses symbols (e.g. ">>" for buttons but exposes
+        more useful information via the accessible's name.
+
+        Arguments:
+        - obj: the object
+
+        Returns the text being displayed for an object or None if there isn't
+        any text being shown.
+        """
+
+        if obj.getRole() == pyatspi.ROLE_PUSH_BUTTON and obj.name:
+            return obj.name
+        else:
+            return default.Script.getDisplayedText(self, obj)
+
     def isFunctionalDialog(self, obj):
         """Returns true if the window is functioning as a dialog."""