Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reinstate buster's changes, with a fix for the nsCOMPtr problem.

Browse Source
This commit is contained in:
sfraser%netscape.com 1999-01-15 00:03:41 +00:00
parent e010fff2cc
commit f0793df5ed
6 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/base/InsertTextTxn.cpp
View File

@ -57,7 +57,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
// set out param default value // set out param default value
if (nsnull!=aDidMerge) if (nsnull!=aDidMerge)
*aDidMerge=PR_FALSE; *aDidMerge=PR_FALSE;
/* XXX: Doesn't compile on Mac. While the hell not???
if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) if ((nsnull!=aDidMerge) && (nsnull!=aTransaction))
{ {
// if aTransaction isa InsertTextTxn, absorb it // if aTransaction isa InsertTextTxn, absorb it
@ -71,7 +70,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
} }
*aDidMerge = PR_TRUE; *aDidMerge = PR_TRUE;
} }
*/
return NS_OK; return NS_OK;
} }

7
editor/base/InsertTextTxn.h
View File

@ -41,6 +41,13 @@ public:
PRUint32 aOffset, PRUint32 aOffset,
const nsString& aStringToInsert); const nsString& aStringToInsert);
private:
// default ctor so that nsCOMPtr is happy
InsertTextTxn() : EditTxn(nsnull) {}
public:
virtual nsresult Do(void); virtual nsresult Do(void);
virtual nsresult Undo(void); virtual nsresult Undo(void);

2
editor/core/InsertTextTxn.cpp
View File

@ -57,7 +57,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
// set out param default value // set out param default value
if (nsnull!=aDidMerge) if (nsnull!=aDidMerge)
*aDidMerge=PR_FALSE; *aDidMerge=PR_FALSE;
/* XXX: Doesn't compile on Mac. While the hell not???
if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) if ((nsnull!=aDidMerge) && (nsnull!=aTransaction))
{ {
// if aTransaction isa InsertTextTxn, absorb it // if aTransaction isa InsertTextTxn, absorb it
@ -71,7 +70,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
} }
*aDidMerge = PR_TRUE; *aDidMerge = PR_TRUE;
} }
*/
return NS_OK; return NS_OK;
} }

7
editor/core/InsertTextTxn.h
View File

@ -41,6 +41,13 @@ public:
PRUint32 aOffset, PRUint32 aOffset,
const nsString& aStringToInsert); const nsString& aStringToInsert);
private:
// default ctor so that nsCOMPtr is happy
InsertTextTxn() : EditTxn(nsnull) {}
public:
virtual nsresult Do(void); virtual nsresult Do(void);
virtual nsresult Undo(void); virtual nsresult Undo(void);

2
editor/libeditor/base/InsertTextTxn.cpp
View File

@ -57,7 +57,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
// set out param default value // set out param default value
if (nsnull!=aDidMerge) if (nsnull!=aDidMerge)
*aDidMerge=PR_FALSE; *aDidMerge=PR_FALSE;
/* XXX: Doesn't compile on Mac. While the hell not???
if ((nsnull!=aDidMerge) && (nsnull!=aTransaction)) if ((nsnull!=aDidMerge) && (nsnull!=aTransaction))
{ {
// if aTransaction isa InsertTextTxn, absorb it // if aTransaction isa InsertTextTxn, absorb it
@ -71,7 +70,6 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
} }
*aDidMerge = PR_TRUE; *aDidMerge = PR_TRUE;
} }
*/
return NS_OK; return NS_OK;
} }

7
editor/libeditor/base/InsertTextTxn.h
View File

@ -41,6 +41,13 @@ public:
PRUint32 aOffset, PRUint32 aOffset,
const nsString& aStringToInsert); const nsString& aStringToInsert);
private:
// default ctor so that nsCOMPtr is happy
InsertTextTxn() : EditTxn(nsnull) {}
public:
virtual nsresult Do(void); virtual nsresult Do(void);
virtual nsresult Undo(void); virtual nsresult Undo(void);