Index: mozilla/editor/libeditor/base/nsEditor.cpp
===================================================================
RCS file: /cvsroot/mozilla/editor/libeditor/base/nsEditor.cpp,v
retrieving revision 1.464
diff -pU40 -r1.464 mozilla/editor/libeditor/base/nsEditor.cpp
--- mozilla/editor/libeditor/base/nsEditor.cpp
+++ mozilla/editor/libeditor/base/nsEditor.cpp
@@ -1384,81 +1384,81 @@ nsEditor::SplitNode(nsIDOMNode * aNode,
                     PRInt32      aOffset,
                     nsIDOMNode **aNewLeftNode)
 {
   PRInt32 i;
   nsIEditActionListener *listener;
   nsAutoRules beginRulesSniffing(this, kOpSplitNode, nsIEditor::eNext);
 
   if (mActionListeners)
   {
     for (i = 0; i < mActionListeners->Count(); i++)
     {
       listener = (nsIEditActionListener *)mActionListeners->ElementAt(i);
       if (listener)
         listener->WillSplitNode(aNode, aOffset);
     }
   }
 
   SplitElementTxn *txn;
   nsresult result = CreateTxnForSplitNode(aNode, aOffset, &txn);
   if (NS_SUCCEEDED(result))  
   {
     result = DoTransaction(txn);
     if (NS_SUCCEEDED(result))
     {
       result = txn->GetNewNode(aNewLeftNode);
       NS_ASSERTION((NS_SUCCEEDED(result)), "result must succeeded for GetNewNode");
     }
   }
   // The transaction system (if any) has taken ownership of txn
   NS_IF_RELEASE(txn);
 
   mRangeUpdater.SelAdjSplitNode(aNode, aOffset, *aNewLeftNode);
 
   if (mActionListeners)
   {
     for (i = 0; i < mActionListeners->Count(); i++)
     {
       listener = (nsIEditActionListener *)mActionListeners->ElementAt(i);
       if (listener)
       {
-        nsIDOMNode *ptr = (aNewLeftNode) ? *aNewLeftNode : 0;
+        nsIDOMNode *ptr = *aNewLeftNode;
         listener->DidSplitNode(aNode, aOffset, ptr, result);
       }
     }
   }
 
   return result;
 }
 
 
 
 NS_IMETHODIMP
 nsEditor::JoinNodes(nsIDOMNode * aLeftNode,
                     nsIDOMNode * aRightNode,
                     nsIDOMNode * aParent)
 {
   PRInt32 i, offset;
   nsIEditActionListener *listener;
   nsAutoRules beginRulesSniffing(this, kOpJoinNode, nsIEditor::ePrevious);
 
   // remember some values; later used for saved selection updating.
   // find the offset between the nodes to be joined.
   nsresult result = GetChildOffset(aRightNode, aParent, offset);
   if (NS_FAILED(result)) return result;
   // find the number of children of the lefthand node
   PRUint32 oldLeftNodeLen;
   result = GetLengthOfDOMNode(aLeftNode, oldLeftNodeLen);
   if (NS_FAILED(result)) return result;
 
   if (mActionListeners)
   {
     for (i = 0; i < mActionListeners->Count(); i++)
     {
       listener = (nsIEditActionListener *)mActionListeners->ElementAt(i);
       if (listener)
         listener->WillJoinNodes(aLeftNode, aRightNode, aParent);
     }
   }
 
   JoinElementTxn *txn;
   result = CreateTxnForJoinNode(aLeftNode, aRightNode, &txn);