Commit 0f60b220 authored by mjudge%netscape.com's avatar mjudge%netscape.com
Browse files

new modifications to nsCOMPtr to explicitly change to QueryInterface

parent 3360e212

editor/base/DeleteElementTxn.cpp

+4 −2
Original line number Diff line number Diff line
@@ -63,11 +63,13 @@ nsresult DeleteElementTxn::Do(void) 


#ifdef NS_DEBUG

  // begin debug output

  nsCOMPtr<nsIDOMElement> element(mElement);

  nsCOMPtr<nsIDOMElement> element;

  element = do_QueryInterface(mElement, &result);

  nsAutoString elementTag="text node";

  if (element)

    element->GetTagName(elementTag);

  nsCOMPtr<nsIDOMElement> parentElement(mParent);

  nsCOMPtr<nsIDOMElement> parentElement;

  parentElement = do_QueryInterface(mParent, &result);

  nsAutoString parentElementTag="text node";

  if (parentElement)

    parentElement->GetTagName(parentElementTag);

editor/base/DeleteRangeTxn.cpp

+12 −7
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nsresult DeleteRangeTxn::Init(nsIDOMRange *aRange) 
#ifdef NS_DEBUG

    PRUint32 count;

    nsCOMPtr<nsIDOMCharacterData> textNode;

    textNode = mStartParent;

    textNode = do_QueryInterface(mStartParent, &result);

    if (textNode)

      textNode->GetLength(&count);

    else
@@ -74,7 +74,7 @@ nsresult DeleteRangeTxn::Init(nsIDOMRange *aRange) 
    }

    NS_ASSERTION(mStartOffset<=count, "bad start offset");



    textNode = mEndParent;

    textNode = do_QueryInterface(mEndParent, &result);

    if (textNode)

      textNode->GetLength(&count);

    else
@@ -362,11 +362,13 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen 
          break;

#ifdef NS_DEBUG

        // begin debug output

        nsCOMPtr<nsIDOMElement> childElement (child);

        nsCOMPtr<nsIDOMElement> childElement;

        childElement = do_QueryInterface(child, &result);

        nsAutoString childElementTag="text node";

        if (childElement)

          childElement->GetTagName(childElementTag);

        nsCOMPtr<nsIDOMElement> parentElement(parent);

        nsCOMPtr<nsIDOMElement> parentElement;

        parentElement = do_QueryInterface(parent, &result);

        nsAutoString parentElementTag="text node";

        if (parentElement)

          parentElement->GetTagName(parentElementTag);
@@ -425,11 +427,13 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen 
            break;

#ifdef NS_DEBUG

          // begin debug output

          nsCOMPtr<nsIDOMElement> childElement(child);

          nsCOMPtr<nsIDOMElement> childElement;

          childElement = do_QueryInterface(child, &result);

          nsAutoString childElementTag="text node";

          if (childElement)

            childElement->GetTagName(childElementTag);

          nsCOMPtr<nsIDOMElement> parentElement(parent);

          nsCOMPtr<nsIDOMElement> parentElement;

          parentElement = do_QueryInterface(parent, &result);

          nsAutoString parentElementTag="text node";

          if (parentElement)

            parentElement->GetTagName(parentElementTag);
@@ -482,7 +486,8 @@ nsresult DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsArray * 
      aList->AppendElement(parentAsISupports);

#ifdef NS_DEBUG

        // begin debug output

        nsCOMPtr<nsIDOMElement> parentElement(parent);

        nsCOMPtr<nsIDOMElement> parentElement;

        parentElement = do_QueryInterface(parent, &result);

        nsAutoString parentElementTag="text node";

        if (parentElement)

          parentElement->GetTagName(parentElementTag);

editor/base/InsertTextTxn.cpp

+4 −2
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) 
  // set out param default value

  if (nsnull!=aDidMerge)

    *aDidMerge=PR_FALSE;

  nsresult result = NS_OK;

  if ((nsnull!=aDidMerge) && (nsnull!=aTransaction))

  {

    // if aTransaction isa InsertTextTxn, and if the selection hasn't changed,
@@ -112,7 +113,8 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) 
          // a single InsertTextTxn

          nsCOMPtr<EditTxn> childTxn;

          otherTxn->GetTxnAt(0, getter_AddRefs(childTxn));

          nsCOMPtr<InsertTextTxn> otherInsertTxn(childTxn);

          nsCOMPtr<InsertTextTxn> otherInsertTxn;

          otherInsertTxn = do_QueryInterface(childTxn, &result);

          if (otherInsertTxn)

          {

            if (PR_TRUE==IsSequentialInsert(otherInsertTxn))
@@ -127,7 +129,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) 
      }

    }

  }

  return NS_OK;

  return result;

}



nsresult InsertTextTxn::Write(nsIOutputStream *aOutputStream)

editor/base/nsEditor.cpp

+16 −11
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ nsresult nsEditor::CreateTxnForInsertText(const nsString & aStringToInsert, 
  {

    result = NS_ERROR_UNEXPECTED; 

    nsCOMPtr<nsIEnumerator> enumerator;

    enumerator = selection;

    enumerator = do_QueryInterface(selection,&result);

    if (enumerator)

    {

      enumerator->First();
@@ -766,7 +766,8 @@ nsresult nsEditor::CreateTxnForInsertText(const nsString & aStringToInsert, 
          if ((NS_SUCCEEDED(result)) && (node))

          {

            result = NS_ERROR_UNEXPECTED; 

            nsCOMPtr<nsIDOMCharacterData> nodeAsText(node);

            nsCOMPtr<nsIDOMCharacterData> nodeAsText;

            nodeAsText = do_QueryInterface(node,&result);

            if (nodeAsText)

            {

              PRInt32 offset;
@@ -783,8 +784,6 @@ nsresult nsEditor::CreateTxnForInsertText(const nsString & aStringToInsert, 
      }

    }

  }

  else

    result = NS_ERROR_NULL_POINTER;



  return result;

}
@@ -938,7 +937,7 @@ nsresult nsEditor::CreateTxnForDeleteSelection(nsIEditor::Direction aDir, 
  if ((NS_SUCCEEDED(result)) && selection)

  {

    nsCOMPtr<nsIEnumerator> enumerator;

    enumerator = selection;

    enumerator = do_QueryInterface(selection,&result);

    if (enumerator)

    {

      for (enumerator->First(); NS_OK!=enumerator->IsDone(); enumerator->Next())
@@ -970,8 +969,6 @@ nsresult nsEditor::CreateTxnForDeleteSelection(nsIEditor::Direction aDir, 
      }

    }

  }

  else

    result = NS_ERROR_NULL_POINTER;



  // if we didn't build the transaction correctly, destroy the out-param transaction so we don't leak it.

  if (NS_FAILED(result))
@@ -997,10 +994,16 @@ nsEditor::CreateTxnForDeleteInsertionPoint(nsIDOMRange *aRange, 


  // get the node and offset of the insertion point

  nsresult result = aRange->GetStartParent(getter_AddRefs(node));

  aRange->GetStartOffset(&offset);

  if (NS_FAILED(result))

    return result;

  result = aRange->GetStartOffset(&offset);

  if (NS_FAILED(result))

    return result;



  // determine if the insertion point is at the beginning, middle, or end of the node

  nsCOMPtr<nsIDOMCharacterData> nodeAsText(node);

  nsCOMPtr<nsIDOMCharacterData> nodeAsText;

  nodeAsText = do_QueryInterface(node, &result);



  if (nodeAsText)

  {

    PRUint32 count;
@@ -1031,7 +1034,8 @@ nsEditor::CreateTxnForDeleteInsertionPoint(nsIDOMRange *aRange, 
    if ((NS_SUCCEEDED(result)) && priorNode)

    { // there is a priorNode, so delete it's last child (if text content, delete the last char.)

      // if it has no children, delete it

      nsCOMPtr<nsIDOMCharacterData> priorNodeAsText(priorNode);

      nsCOMPtr<nsIDOMCharacterData> priorNodeAsText;

      priorNodeAsText = do_QueryInterface(priorNode, &result);

      if (priorNodeAsText)

      {

        PRUint32 length=0;
@@ -1067,7 +1071,8 @@ nsEditor::CreateTxnForDeleteInsertionPoint(nsIDOMRange *aRange, 
    if ((NS_SUCCEEDED(result)) && nextNode)

    { // there is a priorNode, so delete it's last child (if text content, delete the last char.)

      // if it has no children, delete it

      nsCOMPtr<nsIDOMCharacterData> nextNodeAsText(nextNode);

      nsCOMPtr<nsIDOMCharacterData> nextNodeAsText;

      nextNodeAsText = do_QueryInterface(nextNode,&result);

      if (nextNodeAsText)

      {

        PRUint32 length=0;

editor/libeditor/base/DeleteElementTxn.cpp

+4 −2
Original line number Diff line number Diff line
@@ -63,11 +63,13 @@ nsresult DeleteElementTxn::Do(void) 


#ifdef NS_DEBUG

  // begin debug output

  nsCOMPtr<nsIDOMElement> element(mElement);

  nsCOMPtr<nsIDOMElement> element;

  element = do_QueryInterface(mElement, &result);

  nsAutoString elementTag="text node";

  if (element)

    element->GetTagName(elementTag);

  nsCOMPtr<nsIDOMElement> parentElement(mParent);

  nsCOMPtr<nsIDOMElement> parentElement;

  parentElement = do_QueryInterface(mParent, &result);

  nsAutoString parentElementTag="text node";

  if (parentElement)

    parentElement->GetTagName(parentElementTag);