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

mshtml: Use create_nselem in exec_hyperlink.

This commit is contained in:
Jacek Caban 2009-10-19 23:05:05 +02:00 committed by Alexandre Julliard
parent 6f48c43581
commit fa1388355f
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/mshtml/editor.c
View File

@ -1125,17 +1125,17 @@ 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) static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)
{ {
nsAString a_str, href_str, ns_url; nsAString href_str, ns_url;
nsIHTMLEditor *html_editor; nsIHTMLEditor *html_editor;
nsIDOMElement *anchor_elem; nsIDOMHTMLElement *anchor_elem;
PRBool insert_link_at_caret; PRBool insert_link_at_caret;
nsISelection *nsselection; nsISelection *nsselection;
BSTR url = NULL; BSTR url = NULL;
INT ret; INT ret;
HRESULT hres = E_FAIL; HRESULT hres = E_FAIL;
static const WCHAR wszA[] = {'a',0}; static const WCHAR aW[] = {'a',0};
static const WCHAR wszHref[] = {'h','r','e','f',0}; static const WCHAR hrefW[] = {'h','r','e','f',0};
TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out);
@ -1164,16 +1164,13 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
if (!nsselection) if (!nsselection)
return E_FAIL; return E_FAIL;
nsAString_Init(&a_str, wszA);
nsAString_Init(&href_str, wszHref);
nsAString_Init(&ns_url, url);
/* create an element for the link */ /* create an element for the link */
nsIDOMDocument_CreateElement(This->nsdoc, &a_str, &anchor_elem); create_nselem(This->doc_node, aW, &anchor_elem);
nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url);
nsAString_Init(&href_str, hrefW);
nsAString_Init(&ns_url, url);
nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url);
nsAString_Finish(&href_str); nsAString_Finish(&href_str);
nsAString_Finish(&a_str);
nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret);
@ -1197,10 +1194,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
if (insert_link_at_caret) { if (insert_link_at_caret) {
/* add them to the document at the caret position */ /* add them to the document at the caret position */
nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, (nsIDOMElement*)anchor_elem, FALSE);
nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); 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); nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, (nsIDOMElement*)anchor_elem);
nsIHTMLEditor_Release(html_editor); nsIHTMLEditor_Release(html_editor);
hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL;