Bug 386971 - rename nsIAccEditableText::editor, r=ginn.chen
authorsurkov.alexander@gmail.com
Wed, 11 Jul 2007 23:56:55 -0700
changeset 3381 0a871a9052e8e3bb7cb9a072ebb1eea959b5b9b4
parent 3380 a9a5861740993c9fd1b39a733fe0f632fbb431c8
child 3382 76fddc95f45378052da78312e37b06713bdfa652
push idunknown
push userunknown
push dateunknown
reviewersginn.chen
bugs386971
milestone1.9a7pre
Bug 386971 - rename nsIAccEditableText::editor, r=ginn.chen
accessible/public/nsIAccessibleEditableText.idl
accessible/src/html/nsHyperTextAccessible.cpp
--- a/accessible/public/nsIAccessibleEditableText.idl
+++ b/accessible/public/nsIAccessibleEditableText.idl
@@ -38,17 +38,17 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
 
 interface nsIEditor;
 
-[scriptable, uuid(1e9884d3-4017-4032-a121-e0185d166db5)]
+[scriptable, uuid(52837507-202d-4e72-a482-5f068a1fd720)]
 interface nsIAccessibleEditableText : nsISupports
 {
   /**
    * Sets the attributes for the text between the two given indices. The old
    * attributes are replaced by the new list of attributes. For example,
    * sets font styles, such as italic, bold...
    *
    * @param startPos - start index of the text whose attributes are modified.
@@ -100,19 +100,19 @@ interface nsIAccessibleEditableText : ns
    * Pastes text from the clipboard.
    *
    * @param position - index at which to insert the text from the system
    *                   clipboard into the text represented by this object.
    */
   void pasteText (in long position);
 
   /**
-   * Returns an editor.
+   * Returns an editor associated with the accessible.
    */
-  [noscript] readonly attribute nsIEditor editor;
+  [noscript] readonly attribute nsIEditor associatedEditor;
 };
 
 /*
  Assumptions:
 
  selectAttributes method takes an nsISupports parameter.
         'set' methods throw exception on failure.
  'wstring' inputs are potentially multibyte (UTF-16 for
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -1130,17 +1130,17 @@ NS_IMETHODIMP nsHyperTextAccessible::Pas
   nsCOMPtr<nsIEditor> editor = GetEditor();
   if (editor && NS_SUCCEEDED(SetCaretOffset(aPosition)))
     return editor->Paste(nsIClipboard::kGlobalClipboard);
 
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetEditor(nsIEditor **aEditor)
+nsHyperTextAccessible::GetAssociatedEditor(nsIEditor **aEditor)
 {
   NS_ENSURE_ARG_POINTER(aEditor);
 
   nsCOMPtr<nsIEditor> editor(GetEditor());
   NS_IF_ADDREF(*aEditor = editor);
 
   return NS_OK;
 }