Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 230439 (Remove anonymous nodeinfomanager and other cleanup). r=caillon, sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@151500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2004-01-18 14:52:21 +00:00
parent e0a847a2af
commit f76a4dbc8a
7 changed files with 27 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
View File

@@ -1094,15 +1094,15 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromTransferable(nsITransferable *transferable
if (insertAsImage)
{
stuffToPaste.Assign(NS_LITERAL_STRING("<IMG src=\""));
stuffToPaste.Append(NS_ConvertUTF8toUCS2(urltext));
AppendUTF8toUTF16(urltext, stuffToPaste);
stuffToPaste.Append(NS_LITERAL_STRING("\" alt=\"\" >"));
}
else /* insert as link */
{
stuffToPaste.Assign(NS_LITERAL_STRING("<A href=\""));
stuffToPaste.Append(NS_ConvertUTF8toUCS2(urltext));
AppendUTF8toUTF16(urltext, stuffToPaste);
stuffToPaste.Append(NS_LITERAL_STRING("\">"));
stuffToPaste.Append(NS_ConvertUTF8toUCS2(urltext));
AppendUTF8toUTF16(urltext, stuffToPaste);
stuffToPaste.Append(NS_LITERAL_STRING("</A>"));
}
nsAutoEditBatch beginBatching(this);
@@ -2151,15 +2151,11 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
nsCOMPtr<nsIDOMNode> contextAsNode, tmp;
nsresult res = NS_OK;
nsCOMPtr<nsIDOMElement> rootElement;
GetRootElement(getter_AddRefs(rootElement));
nsCOMPtr<nsIDOMDocument> domDoc;
GetDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIDocument> doc;
if (rootElement) {
nsCOMPtr<nsIDOMDocument> domDoc;
rootElement->GetOwnerDocument(getter_AddRefs(domDoc));
doc = do_QueryInterface(domDoc);
}
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
// if we have context info, create a fragment for that
nsVoidArray tagStack;