From dff684635f33ce859f1438e441869edff87e4801 Mon Sep 17 00:00:00 2001
From: "ginn.chen%sun.com" <ginn.chen%sun.com>
Date: Tue, 16 May 2006 03:57:44 +0000
Subject: [PATCH] Bug 322903 AccessibleText getTextAtOffset should not cause
 html pane scrolls (fix the reverse inputs) r=aaronleventhal sr=neil

---
 accessible/src/atk/nsAccessibleText.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/accessible/src/atk/nsAccessibleText.cpp b/accessible/src/atk/nsAccessibleText.cpp
index 759f99748c20..6670e76d7152 100644
--- a/accessible/src/atk/nsAccessibleText.cpp
+++ b/accessible/src/atk/nsAccessibleText.cpp
@@ -542,7 +542,7 @@ nsresult nsAccessibleText::GetTextHelper(EGetTextType aType, nsAccessibleTextBou
   //turn off nsCaretAccessible::NotifySelectionChanged
   gSuppressedNotifySelectionChanged = PR_TRUE;
 
-  PRInt32 caretOffset;
+  PRInt32 caretOffset = -1;
   if (NS_SUCCEEDED(GetCaretOffset(&caretOffset))) {
     if (caretOffset != aOffset)
       SetCaretOffset(aOffset);
@@ -551,6 +551,11 @@ nsresult nsAccessibleText::GetTextHelper(EGetTextType aType, nsAccessibleTextBou
   *aStartOffset = *aEndOffset = aOffset;
   rv = GetTextHelperCore(aType, aBoundaryType, aOffset, aStartOffset, aEndOffset, selCon, domSel, aClosure, aText);
 
+  //restore caret offset
+  if (caretOffset >= 0) {
+    SetCaretOffset(caretOffset);
+  }
+
   //turn on nsCaretAccessible::NotifySelectionChanged
   gSuppressedNotifySelectionChanged = PR_FALSE;