From 64b0f22ee52966ef0ffc2bab45145702fd032a7a Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Fri, 28 May 1999 00:16:55 +0000 Subject: [PATCH] Change the transactions to have non-owning pointers to the editor. git-svn-id: svn://10.0.0.236/trunk@33043 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/JoinElementTxn.cpp | 2 +- mozilla/editor/base/JoinElementTxn.h | 2 +- mozilla/editor/base/SplitElementTxn.cpp | 2 +- mozilla/editor/base/SplitElementTxn.h | 2 +- mozilla/editor/libeditor/base/JoinElementTxn.cpp | 2 +- mozilla/editor/libeditor/base/JoinElementTxn.h | 2 +- mozilla/editor/libeditor/base/SplitElementTxn.cpp | 2 +- mozilla/editor/libeditor/base/SplitElementTxn.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/editor/base/JoinElementTxn.cpp b/mozilla/editor/base/JoinElementTxn.cpp index 4125c5e90d3..c6d3902fbda 100644 --- a/mozilla/editor/base/JoinElementTxn.cpp +++ b/mozilla/editor/base/JoinElementTxn.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP JoinElementTxn::Init(nsIEditor *aEditor, nsIDOMNode *aLeftNode, nsIDOMNode *aRightNode) { - mEditor = do_QueryInterface(aEditor); + mEditor = aEditor; mLeftNode = do_QueryInterface(aLeftNode); mRightNode = do_QueryInterface(aRightNode); mOffset=0; diff --git a/mozilla/editor/base/JoinElementTxn.h b/mozilla/editor/base/JoinElementTxn.h index 62659d294bf..644dfbc7ab5 100644 --- a/mozilla/editor/base/JoinElementTxn.h +++ b/mozilla/editor/base/JoinElementTxn.h @@ -87,7 +87,7 @@ protected: /** the parent node containing mLeftNode and mRightNode */ nsCOMPtr mParent; - nsCOMPtr mEditor; + nsIEditor* mEditor; friend class TransactionFactory; diff --git a/mozilla/editor/base/SplitElementTxn.cpp b/mozilla/editor/base/SplitElementTxn.cpp index 9f9d1760d9e..179c1231f23 100644 --- a/mozilla/editor/base/SplitElementTxn.cpp +++ b/mozilla/editor/base/SplitElementTxn.cpp @@ -39,7 +39,7 @@ NS_IMETHODIMP SplitElementTxn::Init(nsIEditor *aEditor, nsIDOMNode *aNode, PRInt32 aOffset) { - mEditor = do_QueryInterface(aEditor); + mEditor = aEditor; mExistingRightNode = do_QueryInterface(aNode); mOffset = aOffset; return NS_OK; diff --git a/mozilla/editor/base/SplitElementTxn.h b/mozilla/editor/base/SplitElementTxn.h index 26622ff334d..ed8b902a297 100644 --- a/mozilla/editor/base/SplitElementTxn.h +++ b/mozilla/editor/base/SplitElementTxn.h @@ -85,7 +85,7 @@ protected: /** the parent shared by mExistingRightNode and mNewLeftNode */ nsCOMPtr mParent; - nsCOMPtr mEditor; + nsIEditor* mEditor; friend class TransactionFactory; diff --git a/mozilla/editor/libeditor/base/JoinElementTxn.cpp b/mozilla/editor/libeditor/base/JoinElementTxn.cpp index 4125c5e90d3..c6d3902fbda 100644 --- a/mozilla/editor/libeditor/base/JoinElementTxn.cpp +++ b/mozilla/editor/libeditor/base/JoinElementTxn.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP JoinElementTxn::Init(nsIEditor *aEditor, nsIDOMNode *aLeftNode, nsIDOMNode *aRightNode) { - mEditor = do_QueryInterface(aEditor); + mEditor = aEditor; mLeftNode = do_QueryInterface(aLeftNode); mRightNode = do_QueryInterface(aRightNode); mOffset=0; diff --git a/mozilla/editor/libeditor/base/JoinElementTxn.h b/mozilla/editor/libeditor/base/JoinElementTxn.h index 62659d294bf..644dfbc7ab5 100644 --- a/mozilla/editor/libeditor/base/JoinElementTxn.h +++ b/mozilla/editor/libeditor/base/JoinElementTxn.h @@ -87,7 +87,7 @@ protected: /** the parent node containing mLeftNode and mRightNode */ nsCOMPtr mParent; - nsCOMPtr mEditor; + nsIEditor* mEditor; friend class TransactionFactory; diff --git a/mozilla/editor/libeditor/base/SplitElementTxn.cpp b/mozilla/editor/libeditor/base/SplitElementTxn.cpp index 9f9d1760d9e..179c1231f23 100644 --- a/mozilla/editor/libeditor/base/SplitElementTxn.cpp +++ b/mozilla/editor/libeditor/base/SplitElementTxn.cpp @@ -39,7 +39,7 @@ NS_IMETHODIMP SplitElementTxn::Init(nsIEditor *aEditor, nsIDOMNode *aNode, PRInt32 aOffset) { - mEditor = do_QueryInterface(aEditor); + mEditor = aEditor; mExistingRightNode = do_QueryInterface(aNode); mOffset = aOffset; return NS_OK; diff --git a/mozilla/editor/libeditor/base/SplitElementTxn.h b/mozilla/editor/libeditor/base/SplitElementTxn.h index 26622ff334d..ed8b902a297 100644 --- a/mozilla/editor/libeditor/base/SplitElementTxn.h +++ b/mozilla/editor/libeditor/base/SplitElementTxn.h @@ -85,7 +85,7 @@ protected: /** the parent shared by mExistingRightNode and mNewLeftNode */ nsCOMPtr mParent; - nsCOMPtr mEditor; + nsIEditor* mEditor; friend class TransactionFactory;