Adapt to fixed selection interfaces.
git-svn-id: svn://10.0.0.236/trunk@27659 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7ec6297b08
commit
9258c252c1
@ -129,7 +129,7 @@ NS_IMETHODIMP nsCaret::QueryInterface(const nsIID& aIID,
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
return !NS_OK;
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
|
||||
@ -310,8 +310,8 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
|
||||
nsCOMPtr<nsIDOMNode> focusNode;
|
||||
PRInt32 focusOffset;
|
||||
|
||||
if (NS_SUCCEEDED(domSelection->GetFocusNodeAndOffset(getter_AddRefs(focusNode), &focusOffset)) &&
|
||||
focusNode)
|
||||
if (NS_SUCCEEDED(domSelection->GetFocusNode(getter_AddRefs(focusNode))) && focusNode &&
|
||||
NS_SUCCEEDED(domSelection->GetFocusOffset(&focusOffset)))
|
||||
{
|
||||
// is this a text node?
|
||||
nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(focusNode);
|
||||
|
||||
@ -129,7 +129,7 @@ NS_IMETHODIMP nsCaret::QueryInterface(const nsIID& aIID,
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
return !NS_OK;
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
|
||||
@ -310,8 +310,8 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
|
||||
nsCOMPtr<nsIDOMNode> focusNode;
|
||||
PRInt32 focusOffset;
|
||||
|
||||
if (NS_SUCCEEDED(domSelection->GetFocusNodeAndOffset(getter_AddRefs(focusNode), &focusOffset)) &&
|
||||
focusNode)
|
||||
if (NS_SUCCEEDED(domSelection->GetFocusNode(getter_AddRefs(focusNode))) && focusNode &&
|
||||
NS_SUCCEEDED(domSelection->GetFocusOffset(&focusOffset)))
|
||||
{
|
||||
// is this a text node?
|
||||
nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(focusNode);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user