fix reading the author field.

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index dc12c17d39ecbe1a1dd18093d542f39909b9588f..0c4c9e9eec1b17d62916a8f13d39e0828b188a0c 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -33,7 +33,7 @@
 #include "support/textutils.h"
 #include "support/tostr.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::lowercase;
 using lyx::support::uppercase;
@@ -75,7 +75,7 @@ public:
                for (i = 0; pos + i < parsize; ++i) {
                        if (string::size_type(i) >= size)
                                break;
-                 if (cs && str[i] != par.getChar(pos + i))
+                       if (cs && str[i] != par.getChar(pos + i))
                                break;
                        if (!cs && uppercase(str[i]) != uppercase(par.getChar(pos + i)))
                                break;
@@ -86,7 +86,7 @@ public:
 
                // if necessary, check whether string matches word
                if (mw) {
-                       if (pos > 0     && IsLetterCharOrDigit(par.getChar(pos - 1)))
+                       if (pos > 0 && IsLetterCharOrDigit(par.getChar(pos - 1)))
                                return false;
                        if (pos + lyx::pos_type(size) < parsize
                                        && IsLetterCharOrDigit(par.getChar(pos + size)));
@@ -106,29 +106,30 @@ private:
 };
 
 
-bool findForward(DocumentIterator & cur, MatchString const & match)
+bool findForward(DocIterator & cur, MatchString const & match)
 {
-       for (; cur.size(); cur.forwardChar())
-               if (match(cur.paragraph(), cur.pos()))
+       for (; cur; cur.forwardChar())
+               if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
                        return true;
        return false;
 }
 
 
-bool findBackwards(DocumentIterator & cur, MatchString const & match)
+bool findBackwards(DocIterator & cur, MatchString const & match)
 {
-       for (; cur.size(); cur.backwardChar())
-               if (match(cur.paragraph(), cur.pos()))
+       for (; cur; cur.backwardChar())
+               if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
                        return true;
        return false;
 }
 
 
-bool findChange(DocumentIterator & cur)
+bool findChange(DocIterator & cur)
 {
-       for (; cur.size(); cur.forwardChar())
-               if ((cur.paragraph().empty() || !cur.empty())
-                   && cur.paragraph().lookupChange(cur.pos()) != Change::UNCHANGED)
+       for (; cur; cur.forwardChar())
+               if (cur.inTexted() && !cur.paragraph().empty() &&
+                   cur.paragraph().lookupChange(cur.pos())
+                   != Change::UNCHANGED)
                        return true;
        return false;
 }
@@ -149,7 +150,7 @@ bool find(BufferView * bv, string const & searchstr, bool cs, bool mw, bool fw)
        if (!searchAllowed(bv, searchstr))
                return false;
 
-       DocumentIterator cur = bv->cursor();
+       DocIterator cur = bv->cursor();
 
        MatchString const match(searchstr, cs, mw);
 
@@ -179,7 +180,7 @@ int replaceAll(BufferView * bv,
        int const rsize = replacestr.size();
        int const ssize = searchstr.size();
 
-       DocumentIterator cur = DocumentIterator(buf.inset());
+       DocIterator cur = doc_iterator_begin(buf.inset());
        while (findForward(cur, match)) {
                lyx::pos_type pos = cur.pos();
                LyXFont const font
@@ -192,7 +193,7 @@ int replaceAll(BufferView * bv,
        }
 
        bv->text()->init(bv);
-       bv->putSelectionAt(DocumentIterator(buf.inset()), 0, false);
+       bv->putSelectionAt(doc_iterator_begin(buf.inset()), 0, false);
        if (num)
                buf.markDirty();
        return num;
@@ -337,7 +338,7 @@ bool findNextChange(BufferView * bv)
        if (!bv->available())
                return false;
 
-       DocumentIterator cur = DocumentIterator(bv->buffer()->inset());
+       DocIterator cur = DocIterator(bv->cursor());
 
        if (!findChange(cur))
                return false;
@@ -366,5 +367,3 @@ bool findNextChange(BufferView * bv)
 
 } // find namespace
 } // lyx namespace
-
-