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

nsHTMLEditor::GetInlinePropertyBase() was not detecting when the selection ends before first char of a text node; b=128401, r=brade, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@123498 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
glazman%netscape.com
2002-06-18 09:20:07 +00:00
parent d642c6edd5
commit 0aa2a089cd
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
View File

@@ -1030,6 +1030,12 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
nsCOMPtr<nsIContent> content;
nsAutoString firstValue, theValue;
iter->CurrentNode(getter_AddRefs(content));
nsCOMPtr<nsIDOMNode> endNode;
PRInt32 endOffset;
result = range->GetEndContainer(getter_AddRefs(endNode));
if (NS_FAILED(result)) return result;
result = range->GetEndOffset(&endOffset);
if (NS_FAILED(result)) return result;
while (NS_ENUMERATOR_FALSE == iter->IsDone())
{
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
@@ -1063,6 +1069,10 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
skipNode = PR_TRUE;
}
}
else if (node == endNode && !endOffset)
{
skipNode = PR_TRUE;
}
}
else
{ // handle non-text leaf nodes here