From 496abd052edad4ba83274aa443c7e4a690ea8dad Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 12 Mar 2019 16:11:41 +0100 Subject: [PATCH] mshtml: Get rid of handle_edit_load. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/editor.c | 5 ----- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 87924c26e3d..00f753c8576 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -488,11 +488,6 @@ void handle_edit_event(HTMLDocumentNode *doc, nsIDOMEvent *event) nsIDOMKeyEvent_Release(key_event); } -void handle_edit_load(HTMLDocument *This) -{ - get_editor_controller(This->doc_obj->nscontainer); -} - static void set_ns_fontname(HTMLDocumentNode *doc, const char *fontname) { nsICommandParams *nsparam = create_nscommand_params(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6600a1d264f..b53b1d0e4ee 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -962,7 +962,7 @@ HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSP nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; -void get_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN; +void setup_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) DECLSPEC_HIDDEN; @@ -1140,7 +1140,6 @@ void handle_edit_event(HTMLDocumentNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; -void handle_edit_load(HTMLDocument*) DECLSPEC_HIDDEN; HRESULT browser_is_dirty(GeckoBrowser*) DECLSPEC_HIDDEN; void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c07245de111..956ba375a69 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1068,7 +1068,7 @@ HRESULT nsnode_to_nsstring(nsIDOMNode *nsnode, nsAString *str) return hres; } -void get_editor_controller(GeckoBrowser *This) +void setup_editor_controller(GeckoBrowser *This) { nsIEditingSession *editing_session = NULL; nsIControllerContext *ctrlctx; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d25f18ec006..4fc557d6a18 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -197,7 +197,7 @@ static void handle_docobj_load(HTMLDocumentObj *doc) } if(doc->nscontainer->usermode == EDITMODE) - handle_edit_load(&doc->basedoc); + setup_editor_controller(doc->nscontainer); if(doc->client) { hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd);