bool findChange(DocIterator & cur)
{
- for (; cur; cur.forwardChar())
- if (cur.inTexted() && cur.pos() != cur.paragraph().size() &&
- cur.paragraph().lookupChange(cur.pos())
+ for (; cur; cur.forwardPos())
+ if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
!= Change::UNCHANGED)
return true;
return false;
return 0;
LCursor & cur = bv->cursor();
- lyx::cap::replaceSelectionWithString(cur, replacestr);
- lyx::cap::setSelectionRange(cur, replacestr.length());
- cur.top() = fw ? cur.selEnd() : cur.selBegin();
+ lyx::cap::replaceSelectionWithString(cur, replacestr, fw);
bv->buffer()->markDirty();
find(bv, searchstr, cs, mw, fw);
bv->update();
if (!bv || ev.action != LFUN_WORD_FIND)
return;
- lyxerr << "find called, cmd: " << ev << std::endl;
+ //lyxerr << "find called, cmd: " << ev << std::endl;
// data is of the form
// "<search>
casesensitive, matchword, forward);
if (!found)
- bv->owner()->message(_("String not found!"));
+ // emit message signal.
+ bv->message(_("String not found!"));
}
bool all = parse_bool(howto);
bool forward = parse_bool(howto);
- LyXView * lv = bv->owner();
+ Buffer * buf = bv->buffer();
int const replace_count = all
? ::replaceAll(bv, search, replace, casesensitive, matchword)
: ::replace(bv, search, replace, casesensitive, matchword, forward);
if (replace_count == 0) {
- lv->message(_("String not found!"));
+ // emit message signal.
+ buf->message(_("String not found!"));
} else {
if (replace_count == 1) {
- lv->message(_("String has been replaced."));
+ // emit message signal.
+ buf->message(_("String has been replaced."));
} else {
string str = convert<string>(replace_count);
str += _(" strings have been replaced.");
- lv->message(str);
+ // emit message signal.
+ buf->message(str);
}
}
}
if (!bv->available())
return false;
- DocIterator cur = DocIterator(bv->cursor());
+ DocIterator cur = bv->cursor();
if (!findChange(cur))
return false;
- Paragraph const & par = cur.paragraph();
- const pos_type pos = cur.pos();
+ bv->cursor().setCursor(cur);
+ bv->cursor().resetAnchor();
- Change orig_change = par.lookupChangeFull(pos);
- const pos_type parsize = par.size();
- pos_type end = pos;
+ Change orig_change = cur.paragraph().lookupChange(cur.pos());
- for (; end != parsize; ++end) {
- Change change = par.lookupChangeFull(end);
+ DocIterator et = doc_iterator_end(cur.inset());
+ for (; cur != et; cur.forwardPosNoDescend()) {
+ Change change = cur.paragraph().lookupChange(cur.pos());
if (change != orig_change) {
- // slight UI optimisation: for replacements, we get
- // text like : _old_new. Consider that as one change.
- if (!(orig_change.type == Change::DELETED &&
- change.type == Change::INSERTED))
- break;
+ break;
}
}
- pos_type length = end - pos;
- bv->putSelectionAt(cur, length, false);
+ // Now put cursor to end of selection:
+ bv->cursor().setCursor(cur);
+ bv->cursor().setSelection();
// if we used a lfun like in find/replace, dispatch would do
// that for us
bv->update();