while (((pos + i) < par->size())
&& (string::size_type(i) < size)
&& (cs ? (str[i] == par->getChar(pos + i))
- : (toupper(str[i]) == toupper(par->getChar(pos + i)))))
+ : (uppercase(str[i]) == uppercase(par->getChar(pos + i)))))
{
++i;
}
Paragraph * par = text->cursor.par();
pos_type pos = text->cursor.pos();
Paragraph * prev_par = par;
- pos_type prev_pos;
UpdatableInset * inset;
while (par && !IsStringInText(par, pos, str, cs, mw)) {
if (pos >= par->size()) {
prev_par = par;
- // consider 0-sized empty pars
- prev_pos = std::min(pos, par->size());
par = par->next();
pos = 0;
}
} else {
// make sure we end up at the end of the text,
// not the start point of the last search
- text->setCursor(bv, prev_par, prev_pos);
+ text->setCursor(bv, prev_par, prev_par->size());
return SR_NOT_FOUND;
}
}
Paragraph * par = text->cursor.par();
pos_type pos = text->cursor.pos();
Paragraph * prev_par = par;
- pos_type prev_pos = pos;
do {
if (pos > 0)
--pos;
else {
- prev_pos = pos;
prev_par = par;
// We skip empty paragraphs (Asger)
do {
return SR_FOUND;
} else {
// go to the last part of the unsuccessful search
- text->setCursor(bv, prev_par, prev_pos);
+ text->setCursor(bv, prev_par, 0);
return SR_NOT_FOUND;
}
}