ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use stored nsdoc in exec_hyperlink.

This commit is contained in:
Jacek Caban 2008-10-08 13:28:19 -05:00 committed by Alexandre Julliard
parent 23937c4704
commit 7c7b7f0ae7
1 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
dlls/mshtml/editor.c
View File

@ -1146,13 +1146,18 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP
static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)
{
nsAString a_str, href_str, ns_url;
nsIHTMLEditor *html_editor;
nsIDOMElement *anchor_elem;
PRBool insert_link_at_caret;
nsISelection *nsselection;
BSTR url = NULL;
INT ret;
nsISelection *nsselection;
nsIDOMDocument *nsdoc;
nsresult nsres;
HRESULT hres = E_FAIL;
static const WCHAR wszA[] = {'a',0};
static const WCHAR wszHref[] = {'h','r','e','f',0};
TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out);
if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER)
@ -1171,30 +1176,21 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
return OLECMDERR_E_CANCELED;
}
if(This->nsdoc) {
WARN("NULL nsdoc\n");
return E_UNEXPECTED;
}
nsselection = get_ns_selection(This);
if (!nsselection)
return E_FAIL;
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
if(NS_SUCCEEDED(nsres))
{
static const WCHAR wszA[] = {'a',0};
static const WCHAR wszHref[] = {'h','r','e','f',0};
nsIHTMLEditor *html_editor;
nsIDOMNode *text_node;
nsIDOMElement *anchor_elem;
nsIDOMNode *unused_node;
nsAString a_str;
nsAString href_str;
nsAString ns_url;
PRBool insert_link_at_caret;
nsAString_Init(&a_str, wszA);
nsAString_Init(&href_str, wszHref);
nsAString_Init(&ns_url, url);
/* create an element for the link */
nsIDOMDocument_CreateElement(nsdoc, &a_str, &anchor_elem);
nsIDOMDocument_CreateElement(This->nsdoc, &a_str, &anchor_elem);
nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url);
nsAString_Finish(&href_str);
@ -1203,9 +1199,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret);
/* create an element with text of URL */
if (insert_link_at_caret)
{
nsIDOMDocument_CreateTextNode(nsdoc, &ns_url, (nsIDOMText **)&text_node);
if (insert_link_at_caret) {
nsIDOMNode *text_node, *unused_node;
nsIDOMDocument_CreateTextNode(This->nsdoc, &ns_url, (nsIDOMText **)&text_node);
/* wrap the <a> tags around the text element */
nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node);
@ -1216,31 +1213,27 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
nsAString_Finish(&ns_url);
nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor);
if (html_editor)
{
if (insert_link_at_caret)
{
if (html_editor) {
nsresult nsres;
if (insert_link_at_caret) {
/* add them to the document at the caret position */
nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE);
nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem);
}
else /* add them around the selection using the magic provided to us by nsIHTMLEditor */
}else /* add them around the selection using the magic provided to us by nsIHTMLEditor */
nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem);
nsIHTMLEditor_Release(html_editor);
}
nsIDOMElement_Release(anchor_elem);
nsIDOMDocument_Release(nsdoc);
hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL;
}
nsISelection_Release(nsselection);
nsIDOMElement_Release(anchor_elem);
if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER)
SysFreeString(url);
TRACE("-- 0x%08x\n", nsres);
TRACE("-- 0x%08x\n", hres);
return hres;
}