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

Changed transactions not to have owning pointers to the Editor.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@33042 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com 1999-05-28 00:13:02 +00:00
parent ecc686ddd7
commit a6a9b7ff1b
24 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/editor/base/ChangeAttributeTxn.cpp
View File

@ -37,7 +37,7 @@ NS_IMETHODIMP ChangeAttributeTxn::Init(nsIEditor *aEditor,
{
if (nsnull!=aEditor && nsnull!=aElement)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mElement = do_QueryInterface(aElement);
mAttribute = aAttribute;
mValue = aValue;

3
mozilla/editor/base/ChangeAttributeTxn.h
View File

@ -36,6 +36,7 @@
class ChangeAttributeTxn : public EditTxn
{
public:
virtual ~ChangeAttributeTxn();
/** Initialize the transaction.
@ -73,7 +74,7 @@ public:
protected:
/** the editor that created this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the element to operate upon */
nsCOMPtr<nsIDOMElement> mElement;

2
mozilla/editor/base/CreateElementTxn.cpp
View File

@ -43,7 +43,7 @@ NS_IMETHODIMP CreateElementTxn::Init(nsIEditor *aEditor,
NS_ASSERTION(aEditor&&aParent, "null args");
if (aEditor && aParent)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mTag = aTag;
mParent = do_QueryInterface(aParent);
mOffsetInParent = aOffsetInParent;

2
mozilla/editor/base/CreateElementTxn.h
View File

@ -76,7 +76,7 @@ public:
protected:
/** the document into which the new node will be inserted */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the tag (mapping to object type) for the new element */
nsString mTag;

2
mozilla/editor/base/DeleteElementTxn.h
View File

@ -34,7 +34,7 @@
class DeleteElementTxn : public EditTxn
{
public:
/** initialize the transaction.
* @param aElement the node to delete
*/

2
mozilla/editor/base/DeleteRangeTxn.cpp
View File

@ -51,7 +51,7 @@ NS_IMETHODIMP DeleteRangeTxn::Init(nsIEditor *aEditor, nsIDOMRange *aRange)
{
if (aEditor && aRange)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mRange = do_QueryInterface(aRange);
nsresult result = aRange->GetStartParent(getter_AddRefs(mStartParent));

4
mozilla/editor/base/DeleteRangeTxn.h
View File

@ -81,7 +81,7 @@ protected:
protected:
/** p1 in the range */
nsCOMPtr<nsIDOMRange> mRange;
nsCOMPtr<nsIDOMRange> mRange; // is this really an owning ptr?
/** p1 in the range */
nsCOMPtr<nsIDOMNode> mStartParent;
@ -99,7 +99,7 @@ protected:
PRInt32 mEndOffset;
/** the editor for this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
friend class TransactionFactory;

2
mozilla/editor/base/DeleteTextTxn.cpp
View File

@ -41,7 +41,7 @@ NS_IMETHODIMP DeleteTextTxn::Init(nsIEditor *aEditor,
PRUint32 aNumCharsToDelete)
{
NS_ASSERTION(aEditor&&aElement, "bad arg");
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mElement = do_QueryInterface(aElement);
mOffset = aOffset;
mNumCharsToDelete = aNumCharsToDelete;

2
mozilla/editor/base/DeleteTextTxn.h
View File

@ -68,7 +68,7 @@ public:
protected:
/** the provider of basic editing operations */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the text element to operate upon */
nsCOMPtr<nsIDOMCharacterData> mElement;

2
mozilla/editor/base/EditAggregateTxn.h
View File

@ -40,8 +40,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
static const nsIID& GetIID() { static nsIID iid = EDIT_AGGREGATE_TXN_IID; return iid; }
EditAggregateTxn();
virtual ~EditAggregateTxn();

2
mozilla/editor/base/InsertElementTxn.cpp
View File

@ -44,7 +44,7 @@ NS_IMETHODIMP InsertElementTxn::Init(nsIDOMNode *aNode,
mNode = do_QueryInterface(aNode);
mParent = do_QueryInterface(aParent);
mOffset = aOffset;
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
return NS_OK;
}

2
mozilla/editor/base/InsertElementTxn.h
View File

@ -74,7 +74,7 @@ protected:
nsCOMPtr<nsIDOMNode> mParent;
/** the editor for this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the index in mParent for the new node */
PRInt32 mOffset;

2
mozilla/editor/libeditor/base/ChangeAttributeTxn.cpp
View File

@ -37,7 +37,7 @@ NS_IMETHODIMP ChangeAttributeTxn::Init(nsIEditor *aEditor,
{
if (nsnull!=aEditor && nsnull!=aElement)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mElement = do_QueryInterface(aElement);
mAttribute = aAttribute;
mValue = aValue;

3
mozilla/editor/libeditor/base/ChangeAttributeTxn.h
View File

@ -36,6 +36,7 @@
class ChangeAttributeTxn : public EditTxn
{
public:
virtual ~ChangeAttributeTxn();
/** Initialize the transaction.
@ -73,7 +74,7 @@ public:
protected:
/** the editor that created this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the element to operate upon */
nsCOMPtr<nsIDOMElement> mElement;

2
mozilla/editor/libeditor/base/CreateElementTxn.cpp
View File

@ -43,7 +43,7 @@ NS_IMETHODIMP CreateElementTxn::Init(nsIEditor *aEditor,
NS_ASSERTION(aEditor&&aParent, "null args");
if (aEditor && aParent)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mTag = aTag;
mParent = do_QueryInterface(aParent);
mOffsetInParent = aOffsetInParent;

2
mozilla/editor/libeditor/base/CreateElementTxn.h
View File

@ -76,7 +76,7 @@ public:
protected:
/** the document into which the new node will be inserted */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the tag (mapping to object type) for the new element */
nsString mTag;

2
mozilla/editor/libeditor/base/DeleteElementTxn.h
View File

@ -34,7 +34,7 @@
class DeleteElementTxn : public EditTxn
{
public:
/** initialize the transaction.
* @param aElement the node to delete
*/

2
mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
View File

@ -51,7 +51,7 @@ NS_IMETHODIMP DeleteRangeTxn::Init(nsIEditor *aEditor, nsIDOMRange *aRange)
{
if (aEditor && aRange)
{
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mRange = do_QueryInterface(aRange);
nsresult result = aRange->GetStartParent(getter_AddRefs(mStartParent));

4
mozilla/editor/libeditor/base/DeleteRangeTxn.h
View File

@ -81,7 +81,7 @@ protected:
protected:
/** p1 in the range */
nsCOMPtr<nsIDOMRange> mRange;
nsCOMPtr<nsIDOMRange> mRange; // is this really an owning ptr?
/** p1 in the range */
nsCOMPtr<nsIDOMNode> mStartParent;
@ -99,7 +99,7 @@ protected:
PRInt32 mEndOffset;
/** the editor for this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
friend class TransactionFactory;

2
mozilla/editor/libeditor/base/DeleteTextTxn.cpp
View File

@ -41,7 +41,7 @@ NS_IMETHODIMP DeleteTextTxn::Init(nsIEditor *aEditor,
PRUint32 aNumCharsToDelete)
{
NS_ASSERTION(aEditor&&aElement, "bad arg");
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
mElement = do_QueryInterface(aElement);
mOffset = aOffset;
mNumCharsToDelete = aNumCharsToDelete;

2
mozilla/editor/libeditor/base/DeleteTextTxn.h
View File

@ -68,7 +68,7 @@ public:
protected:
/** the provider of basic editing operations */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the text element to operate upon */
nsCOMPtr<nsIDOMCharacterData> mElement;

2
mozilla/editor/libeditor/base/EditAggregateTxn.h
View File

@ -40,8 +40,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
static const nsIID& GetIID() { static nsIID iid = EDIT_AGGREGATE_TXN_IID; return iid; }
EditAggregateTxn();
virtual ~EditAggregateTxn();

2
mozilla/editor/libeditor/base/InsertElementTxn.cpp
View File

@ -44,7 +44,7 @@ NS_IMETHODIMP InsertElementTxn::Init(nsIDOMNode *aNode,
mNode = do_QueryInterface(aNode);
mParent = do_QueryInterface(aParent);
mOffset = aOffset;
mEditor = do_QueryInterface(aEditor);
mEditor = aEditor;
return NS_OK;
}

2
mozilla/editor/libeditor/base/InsertElementTxn.h
View File

@ -74,7 +74,7 @@ protected:
nsCOMPtr<nsIDOMNode> mParent;
/** the editor for this transaction */
nsCOMPtr<nsIEditor> mEditor;
nsIEditor* mEditor;
/** the index in mParent for the new node */
PRInt32 mOffset;