From 757df94b07c814380d8de1344bec582e589fad5b Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Fri, 12 Sep 2003 14:32:53 +0000 Subject: [PATCH] Fix problem in lockInsetInInset git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7738 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++++ src/insets/insettext.C | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 7db0575a15..b2b83d6fad 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-09-10 Martin Vermeer + + * insettext.C: remove block causing problems in lockInsetInInset + (mentioned erroneously under Bug #1366) + 2003-09-10 Martin Vermeer * insetcollapsable.C: Simplify by using adjustCommand, and fix bug diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 0c98591a21..0811d0b524 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -383,13 +383,10 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset) ParagraphList::iterator pit = paragraphs.begin(); ParagraphList::iterator pend = paragraphs.end(); - int const id = inset->id(); -lyxerr << "inset:" << inset << " " << id << endl; for (; pit != pend; ++pit) { InsetList::iterator it = pit->insetlist.begin(); InsetList::iterator const end = pit->insetlist.end(); for (; it != end; ++it) { -lyxerr << "it->inset:" << it->inset << endl; if (it->inset == inset) { lyxerr << "InsetText::lockInsetInInset: 1 a" << endl; text_.setCursorIntern(pit, it->pos); @@ -399,13 +396,6 @@ lyxerr << "it->inset:" << it->inset << endl; lyxerr << "InsetText::lockInsetInInset: 1 c" << endl; return true; } - if (it->inset->getInsetFromID(id)) { - lyxerr << "InsetText::lockInsetInInset: 2" << endl; - text_.setCursorIntern(pit, it->pos); - it->inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT)); -lyxerr << "recurse" << endl; - return the_locking_inset->lockInsetInInset(bv, inset); - } } } lyxerr << "InsetText::lockInsetInInset: 3" << endl;