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

reworking editor IME supoprt; r=kin; bugs: 13576, 11878, 11994, 13494, 16432

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@51859 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com
1999-10-26 18:54:47 +00:00
parent b4e2e646cf
commit bb138b3c5c
20 changed files with 474 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
*/
#include "IMETextTxn.h"
#include "IMECommitTxn.h"
#include "nsEditor.h"
#include "nsIDOMCharacterData.h"
#include "nsIPrivateTextRange.h"
@@ -176,23 +175,6 @@ NS_IMETHODIMP IMETextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
return NS_OK;
}
//
// second possible case is that we have a commit transaction
//
IMECommitTxn* commitTxn = nsnull;
result = aTransaction->QueryInterface(IMECommitTxn::GetCID(),(void**)&commitTxn);
if (commitTxn && NS_SUCCEEDED(NS_OK))
{
(void)CollapseTextSelectionOnCommit();
mFixed = PR_TRUE;
*aDidMerge = PR_TRUE; // absorbe the commit transaction
#ifdef DEBUG_TAGUE
printf("IMETextTxn assimilated IMECommitTxn%p\n", aTransaction);
#endif
NS_RELEASE(commitTxn);
return NS_OK;
}
*aDidMerge = PR_FALSE;
return NS_OK;
}
@@ -292,26 +274,29 @@ NS_IMETHODIMP IMETextTxn::CollapseTextSelection(void)
#endif
//
// run through the text range list
// run through the text range list, if any
//
result = mRangeList->GetLength(&textRangeListLength);
if (NS_SUCCEEDED(result))
if (mRangeList)
{
for(i=0;i<textRangeListLength;i++) {
result = mRangeList->Item(i,&textRange);
if (NS_SUCCEEDED(result))
{
result = textRange->GetRangeType(&textRangeType);
if (textRangeType==nsIPrivateTextRange::TEXTRANGE_SELECTEDCONVERTEDTEXT)
result = mRangeList->GetLength(&textRangeListLength);
if (NS_SUCCEEDED(result))
{
for(i=0;i<textRangeListLength;i++) {
result = mRangeList->Item(i,&textRange);
if (NS_SUCCEEDED(result))
{
haveSelectedRange = PR_TRUE;
textRange->GetRangeStart(&selectionStart);
textRange->GetRangeEnd(&selectionEnd);
}
if (textRangeType==nsIPrivateTextRange::TEXTRANGE_CARETPOSITION)
{
haveCaretPosition = PR_TRUE;
textRange->GetRangeStart(&caretPosition);
result = textRange->GetRangeType(&textRangeType);
if (textRangeType==nsIPrivateTextRange::TEXTRANGE_SELECTEDCONVERTEDTEXT)
{
haveSelectedRange = PR_TRUE;
textRange->GetRangeStart(&selectionStart);
textRange->GetRangeEnd(&selectionEnd);
}
if (textRangeType==nsIPrivateTextRange::TEXTRANGE_CARETPOSITION)
{
haveCaretPosition = PR_TRUE;
textRange->GetRangeStart(&caretPosition);
}
}
}
}
@@ -336,15 +321,3 @@ NS_IMETHODIMP IMETextTxn::CollapseTextSelection(void)
return result;
}
NS_IMETHODIMP IMETextTxn::CollapseTextSelectionOnCommit(void)
{
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
if (!ps) return NS_ERROR_NOT_INITIALIZED;
nsresult result = ps->GetSelection(SELECTION_NORMAL, getter_AddRefs(selection));
if (NS_SUCCEEDED(result) && selection){
result = selection->Collapse(mElement,mOffset+mStringToInsert.Length());
}
return result;
}