Fixed 2 more problems with s+r. This fixes #482.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4792 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,8 @@
+2002-07-26  Juergen Vigna  <jug@sad.it>
+
+	* lyxfind.C (LyXReplace): we have to check better if the returned
+	text is not of theLockingInset()->getLockingInset().
+
 2002-07-25  Juergen Vigna  <jug@sad.it>
 
 	* lyxfind.C (LyXReplace): don't replace if we don't get the

src/insets/ChangeLog

@@ -1,3 +1,8 @@
+2002-07-26  Juergen Vigna  <jug@sad.it>
+
+	* insettabular.C (searchForward): check for lastcell if we
+	had a locking inset.
+
 2002-07-25  Juergen Vigna  <jug@sad.it>
 
 	* insettabular.C (insetMotionNotify): Don't update the screen

src/insets/insettabular.C

@@ -2752,6 +2752,9 @@ bool InsetTabular::searchForward(BufferView * bv, string const & str,
 			updateLocal(bv, CELL, false);
 			return true;
 		}
+		if (tabular->IsLastCell(actcell))
+			return false;
+		++actcell;
 	}
 	InsetText * inset = tabular->GetCellInset(actcell);
 	if (inset->searchForward(bv, str, cs, mw)) {

src/lyxfind.C

@@ -14,6 +14,7 @@
 #include "buffer.h"
 #include "debug.h"
 #include "gettext.h"
+#include "insets/insettext.h"
 
 using lyx::pos_type;
 
@@ -85,7 +86,12 @@ int LyXReplace(BufferView * bv,
 	int replace_count = 0;
 	do {
 		text = bv->getLyXText();
-		if (!bv->theLockingInset() || text != bv->text) {
+		// We have to do this check only because mathed insets don't
+		// return their own LyXText but the LyXText of it's parent!
+		if (!bv->theLockingInset() ||
+			((text != bv->text) &&
+			 (text->inset_owner == text->inset_owner->getLockingInset())))
+		{
 			bv->hideCursor();
 			bv->update(text, BufferView::SELECT|BufferView::FITCUR);
 			bv->toggleSelection(false);