anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4792 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-07-26 09:50:16 +00:00
parent a22bf49a4e
commit d0cc00980d
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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> 2002-07-25 Juergen Vigna <jug@sad.it>
* lyxfind.C (LyXReplace): don't replace if we don't get the * lyxfind.C (LyXReplace): don't replace if we don't get the

5
src/insets/ChangeLog
View File

@ -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> 2002-07-25 Juergen Vigna <jug@sad.it>
* insettabular.C (insetMotionNotify): Don't update the screen * insettabular.C (insetMotionNotify): Don't update the screen

3
src/insets/insettabular.C
View File

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

8
src/lyxfind.C
View File

@ -14,6 +14,7 @@
#include "buffer.h" #include "buffer.h"
#include "debug.h" #include "debug.h"
#include "gettext.h" #include "gettext.h"
#include "insets/insettext.h"
using lyx::pos_type; using lyx::pos_type;
@ -85,7 +86,12 @@ int LyXReplace(BufferView * bv,
int replace_count = 0; int replace_count = 0;
do { do {
text = bv->getLyXText(); 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->hideCursor();
bv->update(text, BufferView::SELECT|BufferView::FITCUR); bv->update(text, BufferView::SELECT|BufferView::FITCUR);
bv->toggleSelection(false); bv->toggleSelection(false);