mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix #684, I hope. Redid the case-insensitive Replace All algorithm to replace from a Right side into a Left side, also avoiding use of wx 1.x compatibility functions and doing proper case-insensitive compares rather than searching a lowercased string for a lowercased substring.

Browse source 
Originally committed to SVN as r2204.
This commit is contained in:
Niels Martin Hansen 2008-06-15 17:56:05 +00:00
parent b9d8f72838
commit 59a5e8f3b3
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
aegisub/dialog_search_replace.cpp
View file

@ -480,14 +480,22 @@ void SearchReplaceEngine::ReplaceAll() {
// Normal replace // Normal replace
else { else {
if (!Search.matchCase) { if (!Search.matchCase) {
wxString Left, Right; wxString Left, Right = *Text;
int pos; int pos = 0;
while(Text->Lower().Contains(LookFor.Lower())) { while (pos <= (int)(Right.Len() - LookFor.Len())) {
pos = Text->Lower().Find(LookFor.Lower()); if (Right.Mid(pos, LookFor.Len()).CmpNoCase(LookFor) == 0) {
Left = pos ? Text->Left(pos) : _T(""); Left.Append(Right.Mid(0,pos)).Append(ReplaceWith);
Right = Text->Mid(pos+LookFor.Len()); Right = Right.Mid(pos+LookFor.Len());
*Text = Left + ReplaceWith + Right; count++;
count++; replaced = true;
pos = 0;
}
else {
pos++;
}
}
if (replaced) {
*Text = Left;
} }
} }
else { else {
@ -502,7 +510,6 @@ void SearchReplaceEngine::ReplaceAll() {
if (replaced) { if (replaced) {
AssDialogue *cur = grid->GetDialogue(i); AssDialogue *cur = grid->GetDialogue(i);
cur->UpdateData(); cur->UpdateData();
//cur->ParseASSTags();
} }
} }