r37043 - in lyx-devel/trunk/src: . frontends/qt4

[tommaso]

Author: tommaso
Date: Wed Dec 29 20:59:41 2010
New Revision: 37043
URL: http://www.lyx.org/trac/changeset/37043

Log:
Applying (variation of) fix by stwitt to solve #7172.

Modified:
   lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
   lyx-devel/trunk/src/lyxfind.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Wed Dec 29 
19:20:12 2010        (r37042)
+++ lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Wed Dec 29 
20:59:41 2010        (r37043)
@@ -330,11 +330,11 @@
                dispatch(cmd);
                LYXERR(Debug::FIND, "dispatched");
                if (bv->cursor().result().dispatched()) {
-                       // Match found, selected and replaced if needed
+                       // New match found and selected (old selection replaced 
if needed)
                        return;
                }
 
-               // No match found in current buffer:
+               // No match found in current buffer (however old selection 
might have been replaced)
                // select next buffer in scope, if any
                bool prompt = nextPrevBuffer(buf, opt);
                if (prompt) {
@@ -367,6 +367,9 @@
                lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                          buf_orig->absFileName()));
        bv = view_.documentBufferView();
+       // This may happen after a replace occurred
+       if (cur_orig.pos() > cur_orig.lastpos())
+               cur_orig.pos() = cur_orig.lastpos();
        bv->cursor().setCursor(cur_orig);
 }
 

Modified: lyx-devel/trunk/src/lyxfind.cpp
==============================================================================
--- lyx-devel/trunk/src/lyxfind.cpp     Wed Dec 29 19:20:12 2010        (r37042)
+++ lyx-devel/trunk/src/lyxfind.cpp     Wed Dec 29 20:59:41 2010        (r37043)
@@ -1203,9 +1203,11 @@
        cap::cutSelection(cur, false, false);
        if (!cur.inMathed()) {
                LYXERR(Debug::FIND, "Replacing by pasteParagraphList()ing 
repl_buffer");
+               LYXERR(Debug::FIND, "Before pasteParagraphList() cur=" << cur 
<< endl);
                cap::pasteParagraphList(cur, repl_buffer.paragraphs(),
                                        repl_buffer.params().documentClassPtr(),
                                        bv->buffer().errorList("Paste"));
+               LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << 
endl);
        } else {
                odocstringstream ods;
                OutputParams runparams(&repl_buffer.params().encoding());
@@ -1226,6 +1228,7 @@
                cur.niceInsert(repl_latex);
        }
        cur.pos() -= repl_buffer.paragraphs().begin()->size();
+       LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with len: " 
<< repl_buffer.paragraphs().begin()->size());
        bv->putSelectionAt(DocIterator(cur), 
repl_buffer.paragraphs().begin()->size(), !opt.forward);
        bv->processUpdateFlags(Update::Force);
 }
@@ -1235,7 +1238,7 @@
 bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
 {
        DocIterator cur;
-       int match_len;
+       int match_len = 0;
 
        if (opt.search.empty()) {
                bv->message(_("Search text is empty!"));