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

Fix problem in lockInsetInInset

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7738 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2003-09-12 14:32:53 +00:00
parent 22990dde1f
commit 757df94b07
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-10 Martin Vermeer <martin.vermeer@hut.fi>
* insettext.C: remove block causing problems in lockInsetInInset
(mentioned erroneously under Bug #1366)
2003-09-10 Martin Vermeer <martin.vermeer@hut.fi>
* insetcollapsable.C: Simplify by using adjustCommand, and fix bug

10
src/insets/insettext.C
View File

@ -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;