Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup; r=timeless, sr=kin, bug=209548

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@144268 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com
2003-06-30 14:41:55 +00:00
parent 35930a1c8f
commit af1b482dc7
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/editor/libeditor/base/JoinElementTxn.cpp
View File

@@ -93,8 +93,7 @@ NS_IMETHODIMP JoinElementTxn::DoTransaction(void)
{
mParent= do_QueryInterface(leftParent); // set this instance mParent.
// Other methods will see a non-null mParent and know all is well
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText;
leftNodeAsText = do_QueryInterface(mLeftNode);
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText = do_QueryInterface(mLeftNode);
if (leftNodeAsText)
{
leftNodeAsText->GetLength(&mOffset);
@@ -138,8 +137,7 @@ NS_IMETHODIMP JoinElementTxn::UndoTransaction(void)
nsresult result;
nsCOMPtr<nsIDOMNode>resultNode;
// first, massage the existing node so it is in its post-split state
nsCOMPtr<nsIDOMCharacterData>rightNodeAsText;
rightNodeAsText = do_QueryInterface(mRightNode);
nsCOMPtr<nsIDOMCharacterData>rightNodeAsText = do_QueryInterface(mRightNode);
if (rightNodeAsText)
{
result = rightNodeAsText->DeleteData(0, mOffset);
@@ -147,8 +145,8 @@ NS_IMETHODIMP JoinElementTxn::UndoTransaction(void)
else
{
nsCOMPtr<nsIDOMNode>child;
nsCOMPtr<nsIDOMNode>nextSibling;
result = mRightNode->GetFirstChild(getter_AddRefs(child));
nsCOMPtr<nsIDOMNode>nextSibling;
PRUint32 i;
for (i=0; i<mOffset; i++)
{
@@ -167,15 +165,15 @@ NS_IMETHODIMP JoinElementTxn::UndoTransaction(void)
NS_IMETHODIMP JoinElementTxn::GetIsTransient(PRBool *aIsTransient)
{
if (nsnull!=aIsTransient)
if (aIsTransient)
*aIsTransient = PR_FALSE;
return NS_OK;
}
nsresult JoinElementTxn::Merge(nsITransaction *aTransaction, PRBool *aDidMerge)
{
if (nsnull!=aDidMerge)
*aDidMerge=PR_FALSE;
if (aDidMerge)
*aDidMerge = PR_FALSE;
return NS_OK;
}