diff --git a/mozilla/editor/base/ChangeAttributeTxn.cpp b/mozilla/editor/base/ChangeAttributeTxn.cpp
index f308c194d76..fc013b2e1d9 100644
--- a/mozilla/editor/base/ChangeAttributeTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/ChangeAttributeTxn.h b/mozilla/editor/base/ChangeAttributeTxn.h
index c97cf759df1..02e2bdfb616 100644
--- a/mozilla/editor/base/ChangeAttributeTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/base/CreateElementTxn.cpp b/mozilla/editor/base/CreateElementTxn.cpp
index 25cd713c707..03ed98a8bd9 100644
--- a/mozilla/editor/base/CreateElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/CreateElementTxn.h b/mozilla/editor/base/CreateElementTxn.h
index e19a3fe5654..022ad6bfb79 100644
--- a/mozilla/editor/base/CreateElementTxn.h
+++ b/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);
 
diff --git a/mozilla/editor/base/DeleteElementTxn.cpp b/mozilla/editor/base/DeleteElementTxn.cpp
index 21aa238c398..771c0f26849 100644
--- a/mozilla/editor/base/DeleteElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteElementTxn.h b/mozilla/editor/base/DeleteElementTxn.h
index 1c21c2e2ff6..c4c34eecd2c 100644
--- a/mozilla/editor/base/DeleteElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/base/DeleteRangeTxn.cpp b/mozilla/editor/base/DeleteRangeTxn.cpp
index b0c047d8da0..6bbe7def85f 100644
--- a/mozilla/editor/base/DeleteRangeTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteRangeTxn.h b/mozilla/editor/base/DeleteRangeTxn.h
index c0725ac625a..467d62e473c 100644
--- a/mozilla/editor/base/DeleteRangeTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/base/DeleteTableCellTxn.cpp b/mozilla/editor/base/DeleteTableCellTxn.cpp
index fb855686998..1503221e0a4 100644
--- a/mozilla/editor/base/DeleteTableCellTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteTableCellTxn.h b/mozilla/editor/base/DeleteTableCellTxn.h
index 4acf90b96fa..2f33f397b52 100644
--- a/mozilla/editor/base/DeleteTableCellTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/DeleteTableColumnTxn.cpp b/mozilla/editor/base/DeleteTableColumnTxn.cpp
index 1a0db852640..d59e4a089ac 100644
--- a/mozilla/editor/base/DeleteTableColumnTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteTableColumnTxn.h b/mozilla/editor/base/DeleteTableColumnTxn.h
index 405379ad152..272d79d63f6 100644
--- a/mozilla/editor/base/DeleteTableColumnTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/DeleteTableRowTxn.cpp b/mozilla/editor/base/DeleteTableRowTxn.cpp
index 539f22b06fb..4e75b3a3ee6 100644
--- a/mozilla/editor/base/DeleteTableRowTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteTableRowTxn.h b/mozilla/editor/base/DeleteTableRowTxn.h
index 517341ea5e4..04e9a8dca84 100644
--- a/mozilla/editor/base/DeleteTableRowTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/DeleteTableTxn.cpp b/mozilla/editor/base/DeleteTableTxn.cpp
index f2cd8d1ff19..5a37556624c 100644
--- a/mozilla/editor/base/DeleteTableTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteTableTxn.h b/mozilla/editor/base/DeleteTableTxn.h
index 415e4fc666c..4b9cc5eb6f4 100644
--- a/mozilla/editor/base/DeleteTableTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/DeleteTextTxn.cpp b/mozilla/editor/base/DeleteTextTxn.cpp
index d00ed04c0f3..9cf1487d7a4 100644
--- a/mozilla/editor/base/DeleteTextTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/DeleteTextTxn.h b/mozilla/editor/base/DeleteTextTxn.h
index c0c4fca7f89..e7f0f9e07c9 100644
--- a/mozilla/editor/base/DeleteTextTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/base/EditAggregateTxn.cpp b/mozilla/editor/base/EditAggregateTxn.cpp
index 27f3032aa0e..b218e1131ac 100644
--- a/mozilla/editor/base/EditAggregateTxn.cpp
+++ b/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;
 }
 
diff --git a/mozilla/editor/base/EditAggregateTxn.h b/mozilla/editor/base/EditAggregateTxn.h
index 60a2ce9a306..94ea90f8b33 100644
--- a/mozilla/editor/base/EditAggregateTxn.h
+++ b/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);
diff --git a/mozilla/editor/base/EditTxn.cpp b/mozilla/editor/base/EditTxn.cpp
index b0349a459c0..712ca4b5e9c 100644
--- a/mozilla/editor/base/EditTxn.cpp
+++ b/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;
 }
 
diff --git a/mozilla/editor/base/EditTxn.h b/mozilla/editor/base/EditTxn.h
index 60fbb57b862..7b298664c65 100644
--- a/mozilla/editor/base/EditTxn.h
+++ b/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);
 
 };
 
diff --git a/mozilla/editor/base/InsertElementTxn.cpp b/mozilla/editor/base/InsertElementTxn.cpp
index 27d8d953cfa..92e0f356ceb 100644
--- a/mozilla/editor/base/InsertElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertElementTxn.h b/mozilla/editor/base/InsertElementTxn.h
index b3e0421ede5..3b527c20040 100644
--- a/mozilla/editor/base/InsertElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/base/InsertTableCellTxn.cpp b/mozilla/editor/base/InsertTableCellTxn.cpp
index 1a3b7f82cf2..1c7ceff8766 100644
--- a/mozilla/editor/base/InsertTableCellTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertTableCellTxn.h b/mozilla/editor/base/InsertTableCellTxn.h
index 4533e57d57a..3dcc151f78e 100644
--- a/mozilla/editor/base/InsertTableCellTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/InsertTableColumnTxn.cpp b/mozilla/editor/base/InsertTableColumnTxn.cpp
index 5821e05137a..2574dcf2a7b 100644
--- a/mozilla/editor/base/InsertTableColumnTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertTableColumnTxn.h b/mozilla/editor/base/InsertTableColumnTxn.h
index da6e618c0f3..6f62cbf23aa 100644
--- a/mozilla/editor/base/InsertTableColumnTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/InsertTableRowTxn.cpp b/mozilla/editor/base/InsertTableRowTxn.cpp
index 47cb3ee6c9a..4aab4ecafed 100644
--- a/mozilla/editor/base/InsertTableRowTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertTableRowTxn.h b/mozilla/editor/base/InsertTableRowTxn.h
index 7563d0133df..44582f9efe1 100644
--- a/mozilla/editor/base/InsertTableRowTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/InsertTableTxn.cpp b/mozilla/editor/base/InsertTableTxn.cpp
index 291b944f817..bd639b03ac1 100644
--- a/mozilla/editor/base/InsertTableTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertTableTxn.h b/mozilla/editor/base/InsertTableTxn.h
index df85caa468a..0b89dcba076 100644
--- a/mozilla/editor/base/InsertTableTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/InsertTextTxn.cpp b/mozilla/editor/base/InsertTextTxn.cpp
index eac9148a41b..8072b27ff90 100644
--- a/mozilla/editor/base/InsertTextTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/InsertTextTxn.h b/mozilla/editor/base/InsertTextTxn.h
index 1620e081529..f6c74ccbbfa 100644
--- a/mozilla/editor/base/InsertTextTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/JoinElementTxn.cpp b/mozilla/editor/base/JoinElementTxn.cpp
index ef9e17cb7a6..4125c5e90d3 100644
--- a/mozilla/editor/base/JoinElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/JoinElementTxn.h b/mozilla/editor/base/JoinElementTxn.h
index a85c0abb217..62659d294bf 100644
--- a/mozilla/editor/base/JoinElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/base/JoinTableCellsTxn.cpp b/mozilla/editor/base/JoinTableCellsTxn.cpp
index 5ef822b3edd..468703a13d5 100644
--- a/mozilla/editor/base/JoinTableCellsTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/JoinTableCellsTxn.h b/mozilla/editor/base/JoinTableCellsTxn.h
index 16ac5be63b4..40722f8bf80 100644
--- a/mozilla/editor/base/JoinTableCellsTxn.h
+++ b/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
 
diff --git a/mozilla/editor/base/SplitElementTxn.cpp b/mozilla/editor/base/SplitElementTxn.cpp
index bbc81ece56d..9f9d1760d9e 100644
--- a/mozilla/editor/base/SplitElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/SplitElementTxn.h b/mozilla/editor/base/SplitElementTxn.h
index a2c399bcc58..26622ff334d 100644
--- a/mozilla/editor/base/SplitElementTxn.h
+++ b/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);
 
diff --git a/mozilla/editor/base/nsInsertHTMLTxn.cpp b/mozilla/editor/base/nsInsertHTMLTxn.cpp
index d8798b6e4b3..b77af96891f 100644
--- a/mozilla/editor/base/nsInsertHTMLTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/base/nsInsertHTMLTxn.h b/mozilla/editor/base/nsInsertHTMLTxn.h
index a9e921f319f..1ae66c89879 100644
--- a/mozilla/editor/base/nsInsertHTMLTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/base/nsJSEditorLog.cpp b/mozilla/editor/base/nsJSEditorLog.cpp
index a788e8a1304..5c613e97ab3 100644
--- a/mozilla/editor/base/nsJSEditorLog.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/ChangeAttributeTxn.cpp b/mozilla/editor/libeditor/base/ChangeAttributeTxn.cpp
index f308c194d76..fc013b2e1d9 100644
--- a/mozilla/editor/libeditor/base/ChangeAttributeTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/ChangeAttributeTxn.h b/mozilla/editor/libeditor/base/ChangeAttributeTxn.h
index c97cf759df1..02e2bdfb616 100644
--- a/mozilla/editor/libeditor/base/ChangeAttributeTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/libeditor/base/CreateElementTxn.cpp b/mozilla/editor/libeditor/base/CreateElementTxn.cpp
index 25cd713c707..03ed98a8bd9 100644
--- a/mozilla/editor/libeditor/base/CreateElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/CreateElementTxn.h b/mozilla/editor/libeditor/base/CreateElementTxn.h
index e19a3fe5654..022ad6bfb79 100644
--- a/mozilla/editor/libeditor/base/CreateElementTxn.h
+++ b/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);
 
diff --git a/mozilla/editor/libeditor/base/DeleteElementTxn.cpp b/mozilla/editor/libeditor/base/DeleteElementTxn.cpp
index 21aa238c398..771c0f26849 100644
--- a/mozilla/editor/libeditor/base/DeleteElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/DeleteElementTxn.h b/mozilla/editor/libeditor/base/DeleteElementTxn.h
index 1c21c2e2ff6..c4c34eecd2c 100644
--- a/mozilla/editor/libeditor/base/DeleteElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp b/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
index b0c047d8da0..6bbe7def85f 100644
--- a/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/DeleteRangeTxn.h b/mozilla/editor/libeditor/base/DeleteRangeTxn.h
index c0725ac625a..467d62e473c 100644
--- a/mozilla/editor/libeditor/base/DeleteRangeTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/libeditor/base/DeleteTextTxn.cpp b/mozilla/editor/libeditor/base/DeleteTextTxn.cpp
index d00ed04c0f3..9cf1487d7a4 100644
--- a/mozilla/editor/libeditor/base/DeleteTextTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/DeleteTextTxn.h b/mozilla/editor/libeditor/base/DeleteTextTxn.h
index c0c4fca7f89..e7f0f9e07c9 100644
--- a/mozilla/editor/libeditor/base/DeleteTextTxn.h
+++ b/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:
 
diff --git a/mozilla/editor/libeditor/base/EditAggregateTxn.cpp b/mozilla/editor/libeditor/base/EditAggregateTxn.cpp
index 27f3032aa0e..b218e1131ac 100644
--- a/mozilla/editor/libeditor/base/EditAggregateTxn.cpp
+++ b/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;
 }
 
diff --git a/mozilla/editor/libeditor/base/EditAggregateTxn.h b/mozilla/editor/libeditor/base/EditAggregateTxn.h
index 60a2ce9a306..94ea90f8b33 100644
--- a/mozilla/editor/libeditor/base/EditAggregateTxn.h
+++ b/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);
diff --git a/mozilla/editor/libeditor/base/EditTxn.cpp b/mozilla/editor/libeditor/base/EditTxn.cpp
index b0349a459c0..712ca4b5e9c 100644
--- a/mozilla/editor/libeditor/base/EditTxn.cpp
+++ b/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;
 }
 
diff --git a/mozilla/editor/libeditor/base/EditTxn.h b/mozilla/editor/libeditor/base/EditTxn.h
index 60fbb57b862..7b298664c65 100644
--- a/mozilla/editor/libeditor/base/EditTxn.h
+++ b/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);
 
 };
 
diff --git a/mozilla/editor/libeditor/base/InsertElementTxn.cpp b/mozilla/editor/libeditor/base/InsertElementTxn.cpp
index 27d8d953cfa..92e0f356ceb 100644
--- a/mozilla/editor/libeditor/base/InsertElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/InsertElementTxn.h b/mozilla/editor/libeditor/base/InsertElementTxn.h
index b3e0421ede5..3b527c20040 100644
--- a/mozilla/editor/libeditor/base/InsertElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/libeditor/base/InsertTextTxn.cpp b/mozilla/editor/libeditor/base/InsertTextTxn.cpp
index eac9148a41b..8072b27ff90 100644
--- a/mozilla/editor/libeditor/base/InsertTextTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/InsertTextTxn.h b/mozilla/editor/libeditor/base/InsertTextTxn.h
index 1620e081529..f6c74ccbbfa 100644
--- a/mozilla/editor/libeditor/base/InsertTextTxn.h
+++ b/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
 
diff --git a/mozilla/editor/libeditor/base/JoinElementTxn.cpp b/mozilla/editor/libeditor/base/JoinElementTxn.cpp
index ef9e17cb7a6..4125c5e90d3 100644
--- a/mozilla/editor/libeditor/base/JoinElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/JoinElementTxn.h b/mozilla/editor/libeditor/base/JoinElementTxn.h
index a85c0abb217..62659d294bf 100644
--- a/mozilla/editor/libeditor/base/JoinElementTxn.h
+++ b/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:
   
diff --git a/mozilla/editor/libeditor/base/SplitElementTxn.cpp b/mozilla/editor/libeditor/base/SplitElementTxn.cpp
index bbc81ece56d..9f9d1760d9e 100644
--- a/mozilla/editor/libeditor/base/SplitElementTxn.cpp
+++ b/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;
 }
diff --git a/mozilla/editor/libeditor/base/SplitElementTxn.h b/mozilla/editor/libeditor/base/SplitElementTxn.h
index a2c399bcc58..26622ff334d 100644
--- a/mozilla/editor/libeditor/base/SplitElementTxn.h
+++ b/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);