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

checkin for carpool for multiple seleciton/ime selection and api changes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@39542 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mjudge%netscape.com
1999-07-15 18:19:20 +00:00
parent f9575d1f61
commit 757f22388f
44 changed files with 427 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/editor/base/IMETextTxn.cpp
View File

@@ -104,7 +104,7 @@ NS_IMETHODIMP IMETextTxn::Undo(void)
nsCOMPtr<nsIDOMSelection> selection;
result = mPresShell->GetSelection(getter_AddRefs(selection));
if (NS_SUCCEEDED(result) && selection) {
result = selection->Collapse(mElement, mOffset);
result = selection->Collapse(mElement, mOffset, SELECTION_NORMAL);
NS_ASSERTION((NS_SUCCEEDED(result)), "selection could not be collapsed after undo of IME insert.");
}
}
@@ -281,13 +281,13 @@ NS_IMETHODIMP IMETextTxn::CollapseTextSelection(void)
result = mPresShell->GetSelection(getter_AddRefs(selection));
if (NS_SUCCEEDED(result) && selection){
if (haveSelectedRange) {
result = selection->Collapse(mElement,mOffset+selectionStart);
result = selection->Extend(mElement,mOffset+selectionEnd);
result = selection->Collapse(mElement,mOffset+selectionStart, SELECTION_NORMAL);
result = selection->Extend(mElement,mOffset+selectionEnd, SELECTION_NORMAL);
} else {
if (haveCaretPosition)
result = selection->Collapse(mElement,mOffset+caretPosition);
result = selection->Collapse(mElement,mOffset+caretPosition, SELECTION_NORMAL);
else
result = selection->Collapse(mElement,mOffset+mStringToInsert.Length());
result = selection->Collapse(mElement,mOffset+mStringToInsert.Length(), SELECTION_NORMAL);
}
}
@@ -299,7 +299,7 @@ NS_IMETHODIMP IMETextTxn::CollapseTextSelectionOnCommit(void)
nsCOMPtr<nsIDOMSelection> selection;
nsresult result = mPresShell->GetSelection(getter_AddRefs(selection));
if (NS_SUCCEEDED(result) && selection){
result = selection->Collapse(mElement,mOffset+mStringToInsert.Length());
result = selection->Collapse(mElement,mOffset+mStringToInsert.Length(), SELECTION_NORMAL);
}
return result;