#include "support/lstrings.h"
#include "BufferView.h"
#include "buffer.h"
+#include "debug.h"
#include "gettext.h"
using lyx::pos_type;
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;
UpdatableInset * inset;
while (par && !IsStringInText(par, pos, str, cs, mw)) {
return SR_FOUND_NOUPDATE;
text = bv->getLyXText();
}
- if (pos < par->size() - 1)
- ++pos;
- else {
- pos = 0;
+
+ ++pos;
+
+ if (pos >= par->size()) {
+ prev_par = par;
par = par->next();
+ pos = 0;
}
}
+
if (par) {
text->setCursor(bv, par, pos);
return SR_FOUND;
-#if 0
- } else if (text->inset_owner) {
- // test if we're inside an inset if yes unlock the inset
- // and recall us with the outside LyXText!
- bv->unlockInset((UpdatableInset *)text->inset_owner);
- if (!bv->theLockingInset()) {
- text = bv->getLyXText();
- par = text->cursor.par();
- pos = text->cursor.pos();
- if (pos < par->size() - 1)
- ++pos;
- else {
- pos = 0;
- par = par->next();
- }
- if (!par)
- return SR_NOT_FOUND;
- text->setCursor(bv, par, pos);
- return SearchForward(bv, text, str, cs, mw);
- } else {
- return SR_NOT_FOUND;
- }
-#endif
- } else
+ } 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_par->size());
return SR_NOT_FOUND;
+ }
}
{
Paragraph * par = text->cursor.par();
pos_type pos = text->cursor.pos();
+ Paragraph * prev_par = par;
do {
if (pos > 0)
--pos;
else {
+ prev_par = par;
// We skip empty paragraphs (Asger)
do {
par = par->previous();
if (par) {
text->setCursor(bv, par, pos);
return SR_FOUND;
+ } else {
+ // go to the last part of the unsuccessful search
+ text->setCursor(bv, prev_par, 0);
+ return SR_NOT_FOUND;
}
-#if 0
- else if (text->inset_owner) {
- // test if we're inside an inset if yes unlock the inset
- // and recall us with the outside LyXText!
- bv->unlockInset((UpdatableInset *)text->inset_owner);
- if (!bv->theLockingInset()) {
- return SearchBackward(bv, bv->getLyXText(), str, cs, mw);
- }
- }
-#endif
- return SR_NOT_FOUND;
}