commit 3501e41e81b9b9ad466e1457f3198a6c8493e2a6
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Mar 31 18:33:53 2014 +0200
Do not substract cursors pos from two different cells (fix assertion while
doing adv search)
Fixes: #7944.(cherry picked from commit
f6138ed02f47b8bbe65d3245f9e92686dc24296c)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index ca43d47..b30c069 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1377,7 +1377,8 @@ static void findAdvReplace(BufferView * bv,
FindAndReplaceOptions const & opt, M
DocIterator sel_beg = cur.selectionBegin();
DocIterator sel_end = cur.selectionEnd();
if (&sel_beg.inset() != &sel_end.inset()
- || sel_beg.pit() != sel_end.pit())
+ || sel_beg.pit() != sel_end.pit()
+ || sel_beg.idx() != sel_end.idx())
return;
int sel_len = sel_end.pos() - sel_beg.pos();
LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end
diff --git a/status.21x b/status.21x
index d2605f1..add6a75 100644
--- a/status.21x
+++ b/status.21x
@@ -70,6 +70,9 @@ What's new
- Fix assertion when entering a path into the import dialog (bug 7437).
+- Fix assertion when doing advanced replace with table cells selected (bug
+ 7944).
+
- Failed instant preview compilation now returns an error. And a red box is
drawn around very small preview imagines, so they can be seen (bug 7522).