grammar

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 81b76916e1979a53a456aaf4959de351ce8aae82..0025277e5330406ae1d33eda3113ebf668c3884b 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -459,7 +459,10 @@ void BufferView::setSearchRequestCache(docstring const & text)
        bool matchword;
        bool forward;
        bool wrap;
-       docstring const search = string2find(text, casesensitive, matchword, forward, wrap);
+       bool instant;
+       bool onlysel;
+       docstring const search = string2find(text, casesensitive, matchword,
+                                            forward, wrap, instant, onlysel);
        theClipboard().setFindBuffer(search);
 }
 
@@ -974,15 +977,8 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter)
                CursorSlice const & cs = dit.innerTextSlice();
                int offset = coordOffset(dit).y_;
                int ypos = pm.position() + offset;
-               Row const & row = pm.getRow(cs.pos(), dit.boundary());
-               Dimension row_dim = row.dim();
-               // FIXME: the will not be necessary anymore if Row has both a
-               // dim() which is its full dimension and a contentsDim() which
-               // is the dimension of the text only.
-               if (&row == &pm.rows().front())
-                       row_dim.asc = pm.ascent();
-               if (&row == &pm.rows().back())
-                       row_dim.des = pm.descent();
+               Dimension const & row_dim =
+                       pm.getRow(cs.pos(), dit.boundary()).dim();
                int scrolled = 0;
                if (recenter)
                        scrolled = scroll(ypos - height_/2);
@@ -1645,7 +1641,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        break;
 
                docstring const data =
-                       find2string(searched_string, false, false, act == LFUN_WORD_FIND_FORWARD, false);
+                       find2string(searched_string, false, false,
+                                   act == LFUN_WORD_FIND_FORWARD, false, false, false);
                bool found = lyxfind(this, FuncRequest(LFUN_WORD_FIND, data));
                if (found)
                        dr.screenUpdate(Update::Force | Update::FitCursor);