diff --git a/editor/libeditor/base/ChangeAttributeTxn.cpp b/editor/libeditor/base/ChangeAttributeTxn.cpp index de3d141cbee..bf43761f31c 100644 --- a/editor/libeditor/base/ChangeAttributeTxn.cpp +++ b/editor/libeditor/base/ChangeAttributeTxn.cpp @@ -16,6 +16,10 @@ ChangeAttributeTxn::ChangeAttributeTxn() { } +ChangeAttributeTxn::~ChangeAttributeTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(ChangeAttributeTxn, EditTxn, mElement) diff --git a/editor/libeditor/base/ChangeAttributeTxn.h b/editor/libeditor/base/ChangeAttributeTxn.h index f3ec7fd0fe1..51a52c4c0f8 100644 --- a/editor/libeditor/base/ChangeAttributeTxn.h +++ b/editor/libeditor/base/ChangeAttributeTxn.h @@ -46,6 +46,7 @@ public: NS_IMETHOD RedoTransaction(); protected: + virtual ~ChangeAttributeTxn(); /** the editor that created this transaction */ nsIEditor* mEditor; diff --git a/editor/libeditor/base/CreateElementTxn.cpp b/editor/libeditor/base/CreateElementTxn.cpp index b2db8446638..7c83bb3ece6 100644 --- a/editor/libeditor/base/CreateElementTxn.cpp +++ b/editor/libeditor/base/CreateElementTxn.cpp @@ -32,6 +32,10 @@ CreateElementTxn::CreateElementTxn() { } +CreateElementTxn::~CreateElementTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(CreateElementTxn, EditTxn, mParent, mNewNode, diff --git a/editor/libeditor/base/CreateElementTxn.h b/editor/libeditor/base/CreateElementTxn.h index bf4d708cc2f..b91bd75499c 100644 --- a/editor/libeditor/base/CreateElementTxn.h +++ b/editor/libeditor/base/CreateElementTxn.h @@ -48,7 +48,8 @@ public: NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode); protected: - + virtual ~CreateElementTxn(); + /** the document into which the new node will be inserted */ nsEditor* mEditor; diff --git a/editor/libeditor/base/DeleteNodeTxn.cpp b/editor/libeditor/base/DeleteNodeTxn.cpp index c3a75be0d71..2e15e40581a 100644 --- a/editor/libeditor/base/DeleteNodeTxn.cpp +++ b/editor/libeditor/base/DeleteNodeTxn.cpp @@ -17,6 +17,10 @@ DeleteNodeTxn::DeleteNodeTxn() { } +DeleteNodeTxn::~DeleteNodeTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(DeleteNodeTxn, EditTxn, mNode, mParent, diff --git a/editor/libeditor/base/DeleteNodeTxn.h b/editor/libeditor/base/DeleteNodeTxn.h index 26b4516d6cc..b2ebe167f38 100644 --- a/editor/libeditor/base/DeleteNodeTxn.h +++ b/editor/libeditor/base/DeleteNodeTxn.h @@ -39,6 +39,7 @@ public: NS_IMETHOD RedoTransaction(); protected: + virtual ~DeleteNodeTxn(); /** the element to delete */ nsCOMPtr mNode; diff --git a/editor/libeditor/base/EditAggregateTxn.cpp b/editor/libeditor/base/EditAggregateTxn.cpp index f3dc5d1bb85..2a790a3df90 100644 --- a/editor/libeditor/base/EditAggregateTxn.cpp +++ b/editor/libeditor/base/EditAggregateTxn.cpp @@ -16,6 +16,10 @@ EditAggregateTxn::EditAggregateTxn() { } +EditAggregateTxn::~EditAggregateTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(EditAggregateTxn, EditTxn, mChildren) diff --git a/editor/libeditor/base/EditAggregateTxn.h b/editor/libeditor/base/EditAggregateTxn.h index cf1803a0c20..39d1bc23e96 100644 --- a/editor/libeditor/base/EditAggregateTxn.h +++ b/editor/libeditor/base/EditAggregateTxn.h @@ -41,6 +41,7 @@ public: NS_IMETHOD GetName(nsIAtom **aName); protected: + virtual ~EditAggregateTxn(); nsTArray< nsRefPtr > mChildren; nsCOMPtr mName; diff --git a/editor/libeditor/base/InsertElementTxn.cpp b/editor/libeditor/base/InsertElementTxn.cpp index e5e24b1a3ac..a9fe3bf61ca 100644 --- a/editor/libeditor/base/InsertElementTxn.cpp +++ b/editor/libeditor/base/InsertElementTxn.cpp @@ -24,6 +24,10 @@ InsertElementTxn::InsertElementTxn() { } +InsertElementTxn::~InsertElementTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(InsertElementTxn, EditTxn, mNode, mParent) diff --git a/editor/libeditor/base/InsertElementTxn.h b/editor/libeditor/base/InsertElementTxn.h index 25f5cc6272a..006005496cb 100644 --- a/editor/libeditor/base/InsertElementTxn.h +++ b/editor/libeditor/base/InsertElementTxn.h @@ -39,7 +39,8 @@ public: NS_DECL_EDITTXN protected: - + virtual ~InsertElementTxn(); + /** the element to insert */ nsCOMPtr mNode; diff --git a/editor/libeditor/base/InsertTextTxn.cpp b/editor/libeditor/base/InsertTextTxn.cpp index ebf5ae3d1be..8e416d0dc59 100644 --- a/editor/libeditor/base/InsertTextTxn.cpp +++ b/editor/libeditor/base/InsertTextTxn.cpp @@ -20,6 +20,10 @@ InsertTextTxn::InsertTextTxn() { } +InsertTextTxn::~InsertTextTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(InsertTextTxn, EditTxn, mElement) diff --git a/editor/libeditor/base/InsertTextTxn.h b/editor/libeditor/base/InsertTextTxn.h index 0f31400c216..244951824b0 100644 --- a/editor/libeditor/base/InsertTextTxn.h +++ b/editor/libeditor/base/InsertTextTxn.h @@ -57,6 +57,7 @@ public: NS_IMETHOD GetData(nsString& aResult); protected: + virtual ~InsertTextTxn(); /** return true if aOtherTxn immediately follows this txn */ virtual bool IsSequentialInsert(InsertTextTxn *aOtherTxn); diff --git a/editor/libeditor/base/PlaceholderTxn.cpp b/editor/libeditor/base/PlaceholderTxn.cpp index d3af1ea2ad2..fea91ed0abb 100644 --- a/editor/libeditor/base/PlaceholderTxn.cpp +++ b/editor/libeditor/base/PlaceholderTxn.cpp @@ -23,6 +23,10 @@ PlaceholderTxn::PlaceholderTxn() : EditAggregateTxn(), { } +PlaceholderTxn::~PlaceholderTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_CLASS(PlaceholderTxn) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PlaceholderTxn, diff --git a/editor/libeditor/base/PlaceholderTxn.h b/editor/libeditor/base/PlaceholderTxn.h index 54bbc1c5934..fc3381e69be 100644 --- a/editor/libeditor/base/PlaceholderTxn.h +++ b/editor/libeditor/base/PlaceholderTxn.h @@ -60,6 +60,7 @@ public: NS_IMETHOD RememberEndingSelection(); protected: + virtual ~PlaceholderTxn(); /** the presentation shell, which we'll need to get the selection */ bool mAbsorb; // do we auto absorb any and all transaction? diff --git a/editor/libeditor/base/SplitElementTxn.cpp b/editor/libeditor/base/SplitElementTxn.cpp index 3b5f99ee67c..2299c599c73 100644 --- a/editor/libeditor/base/SplitElementTxn.cpp +++ b/editor/libeditor/base/SplitElementTxn.cpp @@ -24,6 +24,10 @@ SplitElementTxn::SplitElementTxn() { } +SplitElementTxn::~SplitElementTxn() +{ +} + NS_IMPL_CYCLE_COLLECTION_INHERITED(SplitElementTxn, EditTxn, mParent, mNewLeftNode) diff --git a/editor/libeditor/base/SplitElementTxn.h b/editor/libeditor/base/SplitElementTxn.h index 65e97318d14..346d5dd6f97 100644 --- a/editor/libeditor/base/SplitElementTxn.h +++ b/editor/libeditor/base/SplitElementTxn.h @@ -45,7 +45,8 @@ public: NS_IMETHOD GetNewNode(nsIDOMNode **aNewNode); protected: - + virtual ~SplitElementTxn(); + /** the element to operate upon */ nsCOMPtr mExistingRightNode; diff --git a/editor/libeditor/html/nsHTMLEditRules.h b/editor/libeditor/html/nsHTMLEditRules.h index 1a1d53825c4..d468a2df391 100644 --- a/editor/libeditor/html/nsHTMLEditRules.h +++ b/editor/libeditor/html/nsHTMLEditRules.h @@ -67,10 +67,8 @@ class nsHTMLEditRules : public nsTextEditRules, public nsIEditActionListener public: NS_DECL_ISUPPORTS_INHERITED - - nsHTMLEditRules(); - virtual ~nsHTMLEditRules(); + nsHTMLEditRules(); // nsIEditRules methods NS_IMETHOD Init(nsPlaintextEditor *aEditor); @@ -111,6 +109,7 @@ public: NS_IMETHOD DidDeleteSelection(nsISelection *aSelection); protected: + virtual ~nsHTMLEditRules(); enum RulesEndpoint { diff --git a/editor/libeditor/html/nsHTMLEditor.h b/editor/libeditor/html/nsHTMLEditor.h index 7b0fd008be5..2480f22fc70 100644 --- a/editor/libeditor/html/nsHTMLEditor.h +++ b/editor/libeditor/html/nsHTMLEditor.h @@ -94,8 +94,7 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsHTMLEditor, nsPlaintextEditor) - nsHTMLEditor(); - virtual ~nsHTMLEditor(); + nsHTMLEditor(); bool GetReturnInParagraphCreatesNewParagraph(); @@ -260,6 +259,8 @@ public: static bool NodeIsBlockStatic(const mozilla::dom::Element* aElement); static nsresult NodeIsBlockStatic(nsIDOMNode *aNode, bool *aIsBlock); protected: + virtual ~nsHTMLEditor(); + using nsEditor::IsBlockNode; virtual bool IsBlockNode(nsINode *aNode); diff --git a/editor/libeditor/text/nsPlaintextEditor.h b/editor/libeditor/text/nsPlaintextEditor.h index 4f2c3a5b75e..af6bdaa384d 100644 --- a/editor/libeditor/text/nsPlaintextEditor.h +++ b/editor/libeditor/text/nsPlaintextEditor.h @@ -54,8 +54,7 @@ public: eTypedBreak /* user typed enter */ }; - nsPlaintextEditor(); - virtual ~nsPlaintextEditor(); + nsPlaintextEditor(); /* ------------ nsIPlaintextEditor methods -------------- */ NS_DECL_NSIPLAINTEXTEDITOR @@ -162,6 +161,7 @@ public: int32_t &aCaretStyle); protected: + virtual ~nsPlaintextEditor(); NS_IMETHOD InitRules(); void BeginEditorInit();