зеркало из https://github.com/mozilla/pjs.git
Fix build bustage on Win32.
This commit is contained in:
Родитель
18a56f5177
Коммит
1eb6ba3ae2
|
@ -2165,7 +2165,7 @@ nsHTMLEditor::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection)
|
||||||
nsAutoJSEditorLogLock logLock(mJSEditorLog);
|
nsAutoJSEditorLogLock logLock(mJSEditorLog);
|
||||||
|
|
||||||
if (mJSEditorLog)
|
if (mJSEditorLog)
|
||||||
mJSEditorLog->InsertElement(aElement, aDeleteSelection, aReturn);
|
mJSEditorLog->InsertElement(aElement, aDeleteSelection);
|
||||||
#endif // ENABLE_JS_EDITOR_LOG
|
#endif // ENABLE_JS_EDITOR_LOG
|
||||||
|
|
||||||
nsresult res=NS_ERROR_NOT_INITIALIZED;
|
nsresult res=NS_ERROR_NOT_INITIALIZED;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
// KEEPING AROUND FOR A FEW DAYS JUST TO MAKE SURE;
|
// KEEPING AROUND FOR A FEW DAYS JUST TO MAKE SURE;
|
||||||
// BUT IT'S NO LONGER PART OF THE BUILD.
|
// BUT IT'S NO LONGER PART OF THE BUILD.
|
||||||
|
|
||||||
|
#include "nsIDOMDocumentFragment.h"
|
||||||
#include "nsInsertHTMLTxn.h"
|
#include "nsInsertHTMLTxn.h"
|
||||||
#include "nsIDOMSelection.h"
|
#include "nsIDOMSelection.h"
|
||||||
#include "nsIContent.h"
|
#include "nsIContent.h"
|
||||||
|
|
|
@ -658,7 +658,7 @@ nsJSEditorLog::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsJSEditorLog::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection, nsIDOMElement** aReturn)
|
nsJSEditorLog::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection)
|
||||||
{
|
{
|
||||||
// XXX: Need to add code here to dump out the element
|
// XXX: Need to add code here to dump out the element
|
||||||
// XXX: and it's children.
|
// XXX: and it's children.
|
||||||
|
|
|
@ -120,7 +120,7 @@ public:
|
||||||
NS_IMETHOD Align(const nsString& aAlign);
|
NS_IMETHOD Align(const nsString& aAlign);
|
||||||
NS_IMETHOD GetSelectedElement(const nsString& aTagName, nsIDOMElement** aReturn);
|
NS_IMETHOD GetSelectedElement(const nsString& aTagName, nsIDOMElement** aReturn);
|
||||||
NS_IMETHOD CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement** aReturn);
|
NS_IMETHOD CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement** aReturn);
|
||||||
NS_IMETHOD InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection, nsIDOMElement** aReturn);
|
NS_IMETHOD InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection);
|
||||||
NS_IMETHOD InsertLinkAroundSelection(nsIDOMElement* aAnchorElement);
|
NS_IMETHOD InsertLinkAroundSelection(nsIDOMElement* aAnchorElement);
|
||||||
NS_IMETHOD SelectElement(nsIDOMElement* aElement);
|
NS_IMETHOD SelectElement(nsIDOMElement* aElement);
|
||||||
NS_IMETHOD SetCaretAfterElement(nsIDOMElement* aElement);
|
NS_IMETHOD SetCaretAfterElement(nsIDOMElement* aElement);
|
||||||
|
|
|
@ -2165,7 +2165,7 @@ nsHTMLEditor::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection)
|
||||||
nsAutoJSEditorLogLock logLock(mJSEditorLog);
|
nsAutoJSEditorLogLock logLock(mJSEditorLog);
|
||||||
|
|
||||||
if (mJSEditorLog)
|
if (mJSEditorLog)
|
||||||
mJSEditorLog->InsertElement(aElement, aDeleteSelection, aReturn);
|
mJSEditorLog->InsertElement(aElement, aDeleteSelection);
|
||||||
#endif // ENABLE_JS_EDITOR_LOG
|
#endif // ENABLE_JS_EDITOR_LOG
|
||||||
|
|
||||||
nsresult res=NS_ERROR_NOT_INITIALIZED;
|
nsresult res=NS_ERROR_NOT_INITIALIZED;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче