Changed all occurrences of GetUndoString() and GetRedoString() to accept nsString *.

git-svn-id: svn://10.0.0.236/trunk@32955 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/editor/base/ChangeAttributeTxn.cpp

@@ -111,28 +111,28 @@ NS_IMETHODIMP ChangeAttributeTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP ChangeAttributeTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP ChangeAttributeTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
     if (PR_FALSE==mRemoveAttribute)
-      **aString="Change Attribute: ";
+      *aString="Change Attribute: ";
     else
-      **aString="Remove Attribute: ";
-    **aString += mAttribute;
+      *aString="Remove Attribute: ";
+    *aString += mAttribute;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP ChangeAttributeTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP ChangeAttributeTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
     if (PR_FALSE==mRemoveAttribute)
-      **aString="Change Attribute: ";
+      *aString="Change Attribute: ";
     else
-      **aString="Add Attribute: ";
-    **aString += mAttribute;
+      *aString="Add Attribute: ";
+    *aString += mAttribute;
   }
   return NS_OK;
 }

mozilla/editor/base/ChangeAttributeTxn.h

@@ -66,9 +66,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/base/CreateElementTxn.cpp

@@ -203,22 +203,22 @@ NS_IMETHODIMP CreateElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP CreateElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP CreateElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
-    **aString += mTag;
+    *aString="Remove Element: ";
+    *aString += mTag;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP CreateElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP CreateElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Create Element: ";
-    **aString += mTag;
+    *aString="Create Element: ";
+    *aString += mTag;
   }
   return NS_OK;
 }

mozilla/editor/base/CreateElementTxn.h

@@ -67,9 +67,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode);
 

mozilla/editor/base/DeleteElementTxn.cpp

@@ -155,20 +155,20 @@ NS_IMETHODIMP DeleteElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Element: ";
+    *aString="Insert Element: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
+    *aString="Remove Element: ";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteElementTxn.h

@@ -57,9 +57,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/base/DeleteRangeTxn.cpp

@@ -209,20 +209,20 @@ NS_IMETHODIMP DeleteRangeTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteRangeTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteRangeTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Range: ";
+    *aString="Insert Range: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteRangeTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteRangeTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Range: ";
+    *aString="Remove Range: ";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteRangeTxn.h

@@ -62,9 +62,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/base/DeleteTableCellTxn.cpp

@@ -143,20 +143,20 @@ NS_IMETHODIMP DeleteTableCellTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableCellTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTableCellTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableCellTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTableCellTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteTableCellTxn.h

@@ -68,9 +68,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/DeleteTableColumnTxn.cpp

@@ -143,20 +143,20 @@ NS_IMETHODIMP DeleteTableColumnTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableColumnTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTableColumnTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableColumnTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTableColumnTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteTableColumnTxn.h

@@ -68,9 +68,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/DeleteTableRowTxn.cpp

@@ -143,20 +143,20 @@ NS_IMETHODIMP DeleteTableRowTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableRowTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTableRowTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableRowTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTableRowTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteTableRowTxn.h

@@ -69,9 +69,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/DeleteTableTxn.cpp

@@ -91,20 +91,20 @@ NS_IMETHODIMP DeleteTableTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTableTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTableTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTableTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteTableTxn.h

@@ -68,9 +68,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/DeleteTextTxn.cpp

@@ -111,22 +111,22 @@ NS_IMETHODIMP DeleteTextTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTextTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTextTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Text: ";
-    **aString += mDeletedText;
+    *aString="Insert Text: ";
+    *aString += mDeletedText;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTextTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTextTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Text: ";
-    **aString += mDeletedText;
+    *aString="Remove Text: ";
+    *aString += mDeletedText;
   }
   return NS_OK;
 }

mozilla/editor/base/DeleteTextTxn.h

@@ -61,9 +61,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/base/EditAggregateTxn.cpp

@@ -129,17 +129,17 @@ NS_IMETHODIMP EditAggregateTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP EditAggregateTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP EditAggregateTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 
-NS_IMETHODIMP EditAggregateTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP EditAggregateTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 

mozilla/editor/base/EditAggregateTxn.h

@@ -58,9 +58,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   /** append a transaction to this aggregate */
   NS_IMETHOD AppendChild(EditTxn *aTxn);

mozilla/editor/base/EditTxn.cpp

@@ -69,17 +69,17 @@ NS_IMETHODIMP EditTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP EditTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP EditTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 
-NS_IMETHODIMP EditTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP EditTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 

mozilla/editor/base/EditTxn.h

@@ -55,9 +55,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 };
 

mozilla/editor/base/InsertElementTxn.cpp

@@ -123,20 +123,20 @@ NS_IMETHODIMP InsertElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
+    *aString="Remove Element: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Element: ";
+    *aString="Insert Element: ";
   }
   return NS_OK;
 }

mozilla/editor/base/InsertElementTxn.h

@@ -61,9 +61,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/base/InsertTableCellTxn.cpp

@@ -145,20 +145,20 @@ NS_IMETHODIMP InsertTableCellTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableCellTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTableCellTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableCellTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTableCellTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/InsertTableCellTxn.h

@@ -70,9 +70,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/InsertTableColumnTxn.cpp

@@ -145,20 +145,20 @@ NS_IMETHODIMP InsertTableColumnTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableColumnTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTableColumnTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableColumnTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTableColumnTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/InsertTableColumnTxn.h

@@ -71,9 +71,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/InsertTableRowTxn.cpp

@@ -145,20 +145,20 @@ NS_IMETHODIMP InsertTableRowTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableRowTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTableRowTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableRowTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTableRowTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/InsertTableRowTxn.h

@@ -71,9 +71,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/InsertTableTxn.cpp

@@ -145,20 +145,20 @@ NS_IMETHODIMP InsertTableTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTableTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTableTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTableTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/InsertTableTxn.h

@@ -70,9 +70,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/InsertTextTxn.cpp

@@ -160,22 +160,22 @@ NS_IMETHODIMP InsertTextTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTextTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTextTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Text: ";
-    **aString += mStringToInsert;
+    *aString="Remove Text: ";
+    *aString += mStringToInsert;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTextTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTextTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Text: ";
-    **aString += mStringToInsert;
+    *aString="Insert Text: ";
+    *aString += mStringToInsert;
   }
   return NS_OK;
 }

mozilla/editor/base/InsertTextTxn.h

@@ -68,9 +68,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/JoinElementTxn.cpp

@@ -162,20 +162,20 @@ NS_IMETHODIMP JoinElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP JoinElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Join Element";
+    *aString="Join Element";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP JoinElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Split Element";
+    *aString="Split Element";
   }
   return NS_OK;
 }

mozilla/editor/base/JoinElementTxn.h

@@ -67,9 +67,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/base/JoinTableCellsTxn.cpp

@@ -91,20 +91,20 @@ NS_IMETHODIMP JoinTableCellsTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinTableCellsTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP JoinTableCellsTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Table";
+    *aString="Remove Table";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinTableCellsTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP JoinTableCellsTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Table";
+    *aString="Insert Table";
   }
   return NS_OK;
 }

mozilla/editor/base/JoinTableCellsTxn.h

@@ -66,9 +66,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/base/SplitElementTxn.cpp

@@ -196,20 +196,20 @@ NS_IMETHODIMP SplitElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP SplitElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP SplitElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Join Element";
+    *aString="Join Element";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP SplitElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP SplitElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Split Element";
+    *aString="Split Element";
   }
   return NS_OK;
 }

mozilla/editor/base/SplitElementTxn.h

@@ -63,9 +63,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode);
 

mozilla/editor/base/nsInsertHTMLTxn.cpp

@@ -96,20 +96,20 @@ NS_IMETHODIMP nsInsertHTMLTxn::Write(nsIOutputStream *aOutputStream)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsInsertHTMLTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP nsInsertHTMLTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove HTML: ";
+    *aString="Remove HTML: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP nsInsertHTMLTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP nsInsertHTMLTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert HTML: ";
+    *aString="Insert HTML: ";
   }
   return NS_OK;
 }

mozilla/editor/base/nsInsertHTMLTxn.h

@@ -58,9 +58,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/base/nsJSEditorLog.cpp

@@ -261,16 +261,15 @@ nsJSEditorLog::GetString(nsITransaction *aTransaction)
 {
   static char buf[256];
 
-  nsString defaultStr = "<NULL>";
-  nsString *str = &defaultStr;
+  nsString str = "";
 
   aTransaction->GetRedoString(&str);
 
-  if (!str)
-    str = &defaultStr;
+  if (str.Length() == 0)
+    str = "<NULL>";
 
   buf[0] = '\0';
-  str->ToCString(buf, 256);
+  str.ToCString(buf, 256);
 
   return buf;
 }

mozilla/editor/libeditor/base/ChangeAttributeTxn.cpp

@@ -111,28 +111,28 @@ NS_IMETHODIMP ChangeAttributeTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP ChangeAttributeTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP ChangeAttributeTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
     if (PR_FALSE==mRemoveAttribute)
-      **aString="Change Attribute: ";
+      *aString="Change Attribute: ";
     else
-      **aString="Remove Attribute: ";
-    **aString += mAttribute;
+      *aString="Remove Attribute: ";
+    *aString += mAttribute;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP ChangeAttributeTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP ChangeAttributeTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
     if (PR_FALSE==mRemoveAttribute)
-      **aString="Change Attribute: ";
+      *aString="Change Attribute: ";
     else
-      **aString="Add Attribute: ";
-    **aString += mAttribute;
+      *aString="Add Attribute: ";
+    *aString += mAttribute;
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/ChangeAttributeTxn.h

@@ -66,9 +66,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/libeditor/base/CreateElementTxn.cpp

@@ -203,22 +203,22 @@ NS_IMETHODIMP CreateElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP CreateElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP CreateElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
-    **aString += mTag;
+    *aString="Remove Element: ";
+    *aString += mTag;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP CreateElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP CreateElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Create Element: ";
-    **aString += mTag;
+    *aString="Create Element: ";
+    *aString += mTag;
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/CreateElementTxn.h

@@ -67,9 +67,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode);
 

mozilla/editor/libeditor/base/DeleteElementTxn.cpp

@@ -155,20 +155,20 @@ NS_IMETHODIMP DeleteElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Element: ";
+    *aString="Insert Element: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
+    *aString="Remove Element: ";
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/DeleteElementTxn.h

@@ -57,9 +57,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/libeditor/base/DeleteRangeTxn.cpp

@@ -209,20 +209,20 @@ NS_IMETHODIMP DeleteRangeTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteRangeTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteRangeTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Range: ";
+    *aString="Insert Range: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteRangeTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteRangeTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Range: ";
+    *aString="Remove Range: ";
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/DeleteRangeTxn.h

@@ -62,9 +62,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/libeditor/base/DeleteTextTxn.cpp

@@ -111,22 +111,22 @@ NS_IMETHODIMP DeleteTextTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTextTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP DeleteTextTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Text: ";
-    **aString += mDeletedText;
+    *aString="Insert Text: ";
+    *aString += mDeletedText;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DeleteTextTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP DeleteTextTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Text: ";
-    **aString += mDeletedText;
+    *aString="Remove Text: ";
+    *aString += mDeletedText;
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/DeleteTextTxn.h

@@ -61,9 +61,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
 

mozilla/editor/libeditor/base/EditAggregateTxn.cpp

@@ -129,17 +129,17 @@ NS_IMETHODIMP EditAggregateTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP EditAggregateTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP EditAggregateTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 
-NS_IMETHODIMP EditAggregateTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP EditAggregateTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 

mozilla/editor/libeditor/base/EditAggregateTxn.h

@@ -58,9 +58,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   /** append a transaction to this aggregate */
   NS_IMETHOD AppendChild(EditTxn *aTxn);

mozilla/editor/libeditor/base/EditTxn.cpp

@@ -69,17 +69,17 @@ NS_IMETHODIMP EditTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP EditTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP EditTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 
-NS_IMETHODIMP EditTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP EditTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
-    *aString=nsnull;
+    *aString="";
   return NS_OK;
 }
 

mozilla/editor/libeditor/base/EditTxn.h

@@ -55,9 +55,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 };
 

mozilla/editor/libeditor/base/InsertElementTxn.cpp

@@ -123,20 +123,20 @@ NS_IMETHODIMP InsertElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Element: ";
+    *aString="Remove Element: ";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Element: ";
+    *aString="Insert Element: ";
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/InsertElementTxn.h

@@ -61,9 +61,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/libeditor/base/InsertTextTxn.cpp

@@ -160,22 +160,22 @@ NS_IMETHODIMP InsertTextTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTextTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP InsertTextTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Remove Text: ";
-    **aString += mStringToInsert;
+    *aString="Remove Text: ";
+    *aString += mStringToInsert;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP InsertTextTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP InsertTextTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Insert Text: ";
-    **aString += mStringToInsert;
+    *aString="Insert Text: ";
+    *aString += mStringToInsert;
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/InsertTextTxn.h

@@ -68,9 +68,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 // nsISupports declarations
 

mozilla/editor/libeditor/base/JoinElementTxn.cpp

@@ -162,20 +162,20 @@ NS_IMETHODIMP JoinElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP JoinElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Join Element";
+    *aString="Join Element";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP JoinElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP JoinElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Split Element";
+    *aString="Split Element";
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/JoinElementTxn.h

@@ -67,9 +67,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
 protected:
   

mozilla/editor/libeditor/base/SplitElementTxn.cpp

@@ -196,20 +196,20 @@ NS_IMETHODIMP SplitElementTxn::Write(nsIOutputStream *aOutputStream)
   return NS_OK;
 }
 
-NS_IMETHODIMP SplitElementTxn::GetUndoString(nsString **aString)
+NS_IMETHODIMP SplitElementTxn::GetUndoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Join Element";
+    *aString="Join Element";
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP SplitElementTxn::GetRedoString(nsString **aString)
+NS_IMETHODIMP SplitElementTxn::GetRedoString(nsString *aString)
 {
   if (nsnull!=aString)
   {
-    **aString="Split Element";
+    *aString="Split Element";
   }
   return NS_OK;
 }

mozilla/editor/libeditor/base/SplitElementTxn.h

@@ -63,9 +63,9 @@ public:
 
   NS_IMETHOD Write(nsIOutputStream *aOutputStream);
 
-  NS_IMETHOD GetUndoString(nsString **aString);
+  NS_IMETHOD GetUndoString(nsString *aString);
 
-  NS_IMETHOD GetRedoString(nsString **aString);
+  NS_IMETHOD GetRedoString(nsString *aString);
 
   NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode);