mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fixed some s+r bugs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4788 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6e1b894e38
commit
2232b64760
@ -1,5 +1,8 @@
|
||||
2002-07-25 Juergen Vigna <jug@sad.it>
|
||||
|
||||
* lyxfind.C (LyXReplace): don't replace if we don't get the
|
||||
right LyXText.
|
||||
|
||||
* undo_funcs.C (createUndo): remove debugging code.
|
||||
|
||||
2002-07-25 Dekel Tsur <dekelts@tau.ac.il>
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
* insettabular.C (insetMotionNotify): Don't update the screen
|
||||
if we didn't do nothing.
|
||||
(searchForward): last cell was not checked.
|
||||
|
||||
2002-07-25 Dekel Tsur <dekelts@tau.ac.il>
|
||||
|
||||
|
@ -2753,14 +2753,19 @@ bool InsetTabular::searchForward(BufferView * bv, string const & str,
|
||||
return true;
|
||||
}
|
||||
}
|
||||
do {
|
||||
InsetText * inset = tabular->GetCellInset(actcell);
|
||||
InsetText * inset = tabular->GetCellInset(actcell);
|
||||
if (inset->searchForward(bv, str, cs, mw)) {
|
||||
updateLocal(bv, FULL, false);
|
||||
return true;
|
||||
}
|
||||
while (!tabular->IsLastCell(actcell)) {
|
||||
++actcell;
|
||||
inset = tabular->GetCellInset(actcell);
|
||||
if (inset->searchForward(bv, str, cs, mw)) {
|
||||
updateLocal(bv, FULL, false);
|
||||
return true;
|
||||
}
|
||||
++actcell;
|
||||
} while (!tabular->IsLastCell(actcell));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -85,13 +85,15 @@ int LyXReplace(BufferView * bv,
|
||||
int replace_count = 0;
|
||||
do {
|
||||
text = bv->getLyXText();
|
||||
bv->hideCursor();
|
||||
bv->update(text, BufferView::SELECT|BufferView::FITCUR);
|
||||
bv->toggleSelection(false);
|
||||
text->replaceSelectionWithString(bv, replacestr);
|
||||
text->setSelectionOverString(bv, replacestr);
|
||||
bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
|
||||
++replace_count;
|
||||
if (!bv->theLockingInset() || text != bv->text) {
|
||||
bv->hideCursor();
|
||||
bv->update(text, BufferView::SELECT|BufferView::FITCUR);
|
||||
bv->toggleSelection(false);
|
||||
text->replaceSelectionWithString(bv, replacestr);
|
||||
text->setSelectionOverString(bv, replacestr);
|
||||
bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
|
||||
++replace_count;
|
||||
}
|
||||
if (!once)
|
||||
found = LyXFind(bv, searchstr, fw, casesens, matchwrd);
|
||||
} while (!once && replaceall && found);
|
||||
|
Loading…
Reference in New Issue
Block a user