minimal effort implementation of:

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index e47110177f94166c23deab02a6d9bc0246e317d6..5c61a0ff9528a945ff78634c73621d2c270d62c9 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -128,7 +128,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
 bool findChange(DocIterator & cur)
 {
        for (; cur; cur.forwardPos())
-               if (cur.inTexted() && cur.paragraph().lookupChangeType(cur.pos())
+               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
                    != Change::UNCHANGED)
                        return true;
        return false;
@@ -226,9 +226,7 @@ int replace(BufferView * bv, string const & searchstr,
                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();
@@ -274,7 +272,7 @@ void find(BufferView * bv, FuncRequest const & ev)
        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>
@@ -290,7 +288,8 @@ void find(BufferView * bv, FuncRequest const & ev)
                                  casesensitive, matchword, forward);
 
        if (!found)
-               bv->owner()->message(_("String not found!"));
+               // emit message signal.
+               bv->message(_("String not found!"));
 }
 
 
@@ -313,21 +312,24 @@ void replace(BufferView * bv, FuncRequest const & ev)
        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);
                }
        }
 }