[orca] More work on presentation of the LibreOffice Save As dialog

[Joanmarie Diggs <joanied src gnome org>]

commit 8f21b266bdbfa9a5805975c44306860e3370e5e7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Feb 3 12:33:51 2014 -0500

    More work on presentation of the LibreOffice Save As dialog

 src/orca/scripts/apps/soffice/script.py |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index 2bd90cd..7e51f59 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -916,16 +916,6 @@ class Script(default.Script):
             orca.setLocusOfFocus(event, event.source)
             return
 
-        # Ditto.
-        if role == pyatspi.ROLE_TABLE:
-            obj = event.source
-            selectedChildren = self.utilities.selectedChildren(obj)
-            if selectedChildren:
-                obj = selectedChildren[0]
-
-            orca.setLocusOfFocus(event, obj)
-            return
-
     def onFocusedChanged(self, event):
         """Callback for object:state-changed:focused accessibility events."""
 
@@ -948,6 +938,10 @@ class Script(default.Script):
         if start != end:
             return
 
+        # We should present this in response to active-descendant-changed events
+        if event.source.getState().contains(pyatspi.STATE_MANAGES_DESCENDANTS):
+            return
+
         default.Script.onFocusedChanged(self, event)
 
     def onCaretMoved(self, event):
@@ -966,6 +960,10 @@ class Script(default.Script):
         if self.utilities.isCellBeingEdited(event.source):
             orca.setLocusOfFocus(event, event.source.parent, False)
 
+        if not orca_state.locusOfFocus:
+            default.Script.onCaretMoved(self, event)
+            return
+
         if orca_state.locusOfFocus.getRole() == pyatspi.ROLE_TABLE_CELL:
             default.Script.onCaretMoved(self, event)
             return