[orca] Move check to not present old ancestors if in a dialog to default generator

[Joanmarie Diggs <joanied src gnome org>]

commit 2ae8ad42a9cbc2818e034725542ba129ca9b72b2
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Aug 9 05:27:50 2017 -0400

    Move check to not present old ancestors if in a dialog to default generator

 src/orca/scripts/apps/soffice/speech_generator.py |    4 ----
 src/orca/speech_generator.py                      |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/apps/soffice/speech_generator.py 
b/src/orca/scripts/apps/soffice/speech_generator.py
index 7f11ea3..ce849bb 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -481,10 +481,6 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         if self._script.utilities.isSpreadSheetCell(priorObj):
             return []
 
-        frame, dialog = self._script.utilities.frameAndDialog(obj)
-        if dialog:
-            return []
-
         return super()._generateOldAncestors(obj, **args)
 
     def _generateUnselectedCell(self, obj, **args):
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 8e0df33..b3fe3f9 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1751,6 +1751,10 @@ class SpeechGenerator(generator.Generator):
            or pyatspi.findAncestor(obj, lambda x: x == priorObj):
             return []
 
+        frame, dialog = self._script.utilities.frameAndDialog(obj)
+        if dialog:
+            return []
+
         args['leaving'] = True
         args['includeOnly'] = [pyatspi.ROLE_BLOCK_QUOTE,
                                pyatspi.ROLE_FORM,