[orca] Fix for bgo#592138 - Orca speaks the next character rather than the next word when a paragraph bound

[Joanmarie Diggs <joanied src gnome org>]

commit c9905bb24b7e1befeaef08f1bac8d7b2a4992668
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Aug 17 16:44:26 2009 -0400

    Fix for bgo#592138 - Orca speaks the next character rather than the next word when a paragraph boundary is crossed in Writer

 src/orca/default.py                         |    2 +-
 test/keystrokes/oowriter/word-navigation.py |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/default.py b/src/orca/default.py
index 1b2d9ed..dab8fc8 100644
--- a/src/orca/default.py
+++ b/src/orca/default.py
@@ -3482,7 +3482,7 @@ class Script(script.Script):
             if hasLastPos and not inNewObj and isShiftKey and isControlKey:
                 [startOffset, endOffset] = self.getOffsetsForPhrase(obj)
                 self.sayPhrase(obj, startOffset, endOffset)
-            elif isControlKey and not inNewObj:
+            elif isControlKey and not isShiftKey:
                 [startOffset, endOffset] = self.getOffsetsForWord(obj)
                 if startOffset == endOffset:
                     self.sayCharacter(obj)
diff --git a/test/keystrokes/oowriter/word-navigation.py b/test/keystrokes/oowriter/word-navigation.py
index c8dccb1..e7ac571 100644
--- a/test/keystrokes/oowriter/word-navigation.py
+++ b/test/keystrokes/oowriter/word-navigation.py
@@ -82,15 +82,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Next Word",
-    ["BUG? - We should announce the next word here.",
-     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
      "     VISIBLE:  'This is a test. \$l', cursor=16",
      "BRAILLE LINE:  'So is this. \$l'",
      "     VISIBLE:  'So is this. \$l', cursor=1",
      "BRAILLE LINE:  'So is this. \$l'",
      "     VISIBLE:  'So is this. \$l', cursor=1",
      "SPEECH OUTPUT: 'newline'",
-     "SPEECH OUTPUT: 'S'"]))
+     "SPEECH OUTPUT: 'So '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))