From 045c82cdbf103f4db59d3857461ed52102768a9d Mon Sep 17 00:00:00 2001 From: "buster%netscape.com" Date: Thu, 14 Jan 1999 21:52:08 +0000 Subject: [PATCH] backed out Merge functionality because it doesn't compile on Mac. git-svn-id: svn://10.0.0.236/trunk@17752 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/InsertTextTxn.cpp | 3 ++- mozilla/editor/core/InsertTextTxn.cpp | 3 ++- mozilla/editor/libeditor/base/InsertTextTxn.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/editor/base/InsertTextTxn.cpp b/mozilla/editor/base/InsertTextTxn.cpp index 7f19c12796b..8b0332593cf 100644 --- a/mozilla/editor/base/InsertTextTxn.cpp +++ b/mozilla/editor/base/InsertTextTxn.cpp @@ -57,7 +57,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) // set out param default value if (nsnull!=aDidMerge) *aDidMerge=PR_FALSE; - +/* XXX: Doesn't compile on Mac. While the hell not??? if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) { // if aTransaction isa InsertTextTxn, absorb it @@ -71,6 +71,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) } *aDidMerge = PR_TRUE; } +*/ return NS_OK; } diff --git a/mozilla/editor/core/InsertTextTxn.cpp b/mozilla/editor/core/InsertTextTxn.cpp index 7f19c12796b..8b0332593cf 100644 --- a/mozilla/editor/core/InsertTextTxn.cpp +++ b/mozilla/editor/core/InsertTextTxn.cpp @@ -57,7 +57,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) // set out param default value if (nsnull!=aDidMerge) *aDidMerge=PR_FALSE; - +/* XXX: Doesn't compile on Mac. While the hell not??? if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) { // if aTransaction isa InsertTextTxn, absorb it @@ -71,6 +71,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) } *aDidMerge = PR_TRUE; } +*/ return NS_OK; } diff --git a/mozilla/editor/libeditor/base/InsertTextTxn.cpp b/mozilla/editor/libeditor/base/InsertTextTxn.cpp index 7f19c12796b..8b0332593cf 100644 --- a/mozilla/editor/libeditor/base/InsertTextTxn.cpp +++ b/mozilla/editor/libeditor/base/InsertTextTxn.cpp @@ -57,7 +57,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) // set out param default value if (nsnull!=aDidMerge) *aDidMerge=PR_FALSE; - +/* XXX: Doesn't compile on Mac. While the hell not??? if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) { // if aTransaction isa InsertTextTxn, absorb it @@ -71,6 +71,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction) } *aDidMerge = PR_TRUE; } +*/ return NS_OK; }