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

Bug 380364 Fix regressions from bug 236546 r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@227031 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk 2007-05-25 20:47:30 +00:00
parent c0458d11e7
commit cff4fc492b
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/content/base/src/nsDocumentEncoder.cpp
View File

@ -903,11 +903,6 @@ nsDocumentEncoder::EncodeToString(nsAString& aOutputString)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMNode> node, prevNode;
nsCOMPtr<nsIContent> content;
PRBool bTableCellsFound = PR_FALSE;
NS_NAMED_LITERAL_STRING(_begin_tr, "<tr>");
NS_NAMED_LITERAL_STRING(_end_tr, "</tr>");
for (i = 0; i < count; i++) {
mSelection->GetRangeAt(i, getter_AddRefs(range));
@ -916,26 +911,26 @@ nsDocumentEncoder::EncodeToString(nsAString& aOutputString)
// get the row, compare it to previous row and emit </tr><tr> as needed
range->GetStartContainer(getter_AddRefs(node));
NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
content = do_QueryInterface(node);
if (content) {
nsIAtom *name = content->Tag();
if (name == nsGkAtoms::tr && content->IsNodeOfType(nsINode::eHTML)) {
if (prevNode != node) {
if (bTableCellsFound) {
aOutputString.Append(_end_tr);
}
aOutputString.Append(_begin_tr);
prevNode = node;
}
bTableCellsFound = PR_TRUE;
if (node != prevNode) {
if (prevNode) {
rv = SerializeNodeEnd(prevNode, aOutputString);
NS_ENSURE_SUCCESS(rv, rv);
prevNode = nsnull;
}
nsCOMPtr<nsIContent> content = do_QueryInterface(node);
if (content && content->Tag() == nsGkAtoms::tr) {
rv = SerializeNodeStart(node, 0, -1, aOutputString);
NS_ENSURE_SUCCESS(rv, rv);
prevNode = node;
}
}
rv = SerializeRangeToString(range, aOutputString);
NS_ENSURE_SUCCESS(rv, rv);
}
if (bTableCellsFound) {
aOutputString.Append(_end_tr);
if (prevNode) {
rv = SerializeNodeEnd(prevNode, aOutputString);
NS_ENSURE_SUCCESS(rv, rv);
}
mSelection = nsnull;