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

Bug 98153: Remove SubsumeStr. r=dbaron, sr=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@102292 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-09-05 10:46:45 +00:00
parent 6fa04b04c1
commit 234588f481
19 changed files with 76 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/editor/base/nsTextEditRules.cpp
View File

@@ -607,7 +607,6 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
// dont spaz my selection in subtransactions
nsAutoTxnsConserveSelection dontSpazMySelection(mEditor);
nsSubsumeStr subStr;
nsString tString(*outString);
const PRUnichar *unicodeBuf = tString.get();
nsCOMPtr<nsIDOMNode> unused;
@@ -618,6 +617,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
// it is to search for both tabs and newlines.
if (isPRE)
{
NS_NAMED_LITERAL_STRING(newlineStr, "\n");
char newlineChar = '\n';
while (unicodeBuf && (pos != -1) && ((PRUint32)pos < tString.Length()))
{
@@ -638,10 +638,10 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
pos = tString.Length();
}
subStr.Subsume((PRUnichar*)&unicodeBuf[oldPos], PR_FALSE, subStrLen);
nsDependentSubstring subStr(tString, oldPos, subStrLen);
// is it a return?
if (subStr.EqualsWithConversion("\n"))
if (subStr.Equals(newlineStr))
{
if (nsIPlaintextEditor::eEditorSingleLineMask & mFlags)
{
@@ -662,6 +662,8 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
}
else
{
NS_NAMED_LITERAL_STRING(tabStr, "\t");
NS_NAMED_LITERAL_STRING(newlineStr, "\n");
char specialChars[] = {'\t','\n',0};
nsAutoString tabString; tabString.AssignWithConversion(" ");
while (unicodeBuf && (pos != -1) && ((PRUint32)pos < tString.Length()))
@@ -683,16 +685,16 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
pos = tString.Length();
}
subStr.Subsume((PRUnichar*)&unicodeBuf[oldPos], PR_FALSE, subStrLen);
nsDependentSubstring subStr(tString, oldPos, subStrLen);
// is it a tab?
if (subStr.EqualsWithConversion("\t"))
if (subStr.Equals(tabStr))
{
res = mEditor->InsertTextImpl(tabString, address_of(curNode), &curOffset, doc);
pos++;
}
// is it a return?
else if (subStr.EqualsWithConversion("\n"))
else if (subStr.Equals(newlineStr))
{
res = mEditor->CreateBRImpl(address_of(curNode), &curOffset, address_of(unused), nsIEditor::eNone);
pos++;