mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

40457: suppress extra XIF output for cases where the selection 

doesn't intersect the range at all. r=jfrancis, a=beppe.
This commit is contained in:
akkana%netscape.com 2000-06-07 22:58:39 +00:00
Родитель 4d58187b46
Коммит 0fe6a06be9
2 изменённых файлов: 44 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
content/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -586,6 +586,25 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
nsIDOMRange* range = nsnull;
if (NS_SUCCEEDED(enumerator->CurrentItem((nsISupports**)&range))) {
// add whatever part of the node is actually in this range:
nsCOMPtr<nsIDOMNSRange> nsrange (do_QueryInterface(range));
if (!nsrange)
continue;
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(NS_CONST_CAST(nsIContent*,content)));
if (!node)
continue;
PRBool intersects;
nsresult rv = nsrange->IntersectsNode(node, &intersects);
if (NS_FAILED(rv))
return rv;
if (!intersects)
continue; // This range doesn't intersect the node at all
// Put all of our text into the buffer, initially:
nsString buffer;
mText.AppendTo(buffer);
// Clip to whatever is inside the range:
nsCOMPtr<nsIDOMNode> startNode;
nsCOMPtr<nsIDOMNode> endNode;
PRInt32 startOffset = 0;
@ -602,9 +621,6 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
startContent = do_QueryInterface(startNode);
endContent = do_QueryInterface(endNode);
nsString buffer;
mText.AppendTo(buffer);
if (startContent.get() == content || endContent.get() == content)
{
// NOTE: ORDER MATTERS!
@ -612,10 +628,11 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
if (endContent.get() == content)
buffer.Truncate(endOffset);
// This must go after the Trunctate
// This must go after the Truncate
if (startContent.get() == content)
buffer.Cut(0,startOffset);
buffer.Cut(0,startOffset);
}
aConverter->AddContent(buffer);
NS_RELEASE(range);

27
layout/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -586,6 +586,25 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
nsIDOMRange* range = nsnull;
if (NS_SUCCEEDED(enumerator->CurrentItem((nsISupports**)&range))) {
// add whatever part of the node is actually in this range:
nsCOMPtr<nsIDOMNSRange> nsrange (do_QueryInterface(range));
if (!nsrange)
continue;
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(NS_CONST_CAST(nsIContent*,content)));
if (!node)
continue;
PRBool intersects;
nsresult rv = nsrange->IntersectsNode(node, &intersects);
if (NS_FAILED(rv))
return rv;
if (!intersects)
continue; // This range doesn't intersect the node at all
// Put all of our text into the buffer, initially:
nsString buffer;
mText.AppendTo(buffer);
// Clip to whatever is inside the range:
nsCOMPtr<nsIDOMNode> startNode;
nsCOMPtr<nsIDOMNode> endNode;
PRInt32 startOffset = 0;
@ -602,9 +621,6 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
startContent = do_QueryInterface(startNode);
endContent = do_QueryInterface(endNode);
nsString buffer;
mText.AppendTo(buffer);
if (startContent.get() == content || endContent.get() == content)
{
// NOTE: ORDER MATTERS!
@ -612,10 +628,11 @@ nsGenericDOMDataNode::ConvertContentToXIF(const nsIContent *aOuterContent,
if (endContent.get() == content)
buffer.Truncate(endOffset);
// This must go after the Trunctate
// This must go after the Truncate
if (startContent.get() == content)
buffer.Cut(0,startOffset);
buffer.Cut(0,startOffset);
}
aConverter->AddContent(buffer);
NS_RELEASE(range);