anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Validate DocIterator before setting cursor with it, in moveToPosition

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17831 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-04-16 20:47:40 +00:00
parent 0edbcbd60b
commit 6f005d2efa
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BufferView.C
View File

@ -581,7 +581,17 @@ boost::tuple<pit_type, pos_type, int> BufferView::moveToPosition(pit_type bottom
if (top_id > 0) {
ParIterator par = buffer_->getParFromID(top_id);
if (par != buffer_->par_iterator_end()) {
setCursor(makeDocIterator(par, min(par->size(), top_pos)));
DocIterator dit = makeDocIterator(par, min(par->size(), top_pos));
// Some slices of the iterator may not be reachable (e.g. closed collapsable inset)
// so the dociterator may need to be shortened. Otherwise, setCursor may
// crash lyx when the cursor can not be set to these insets.
size_t const n = dit.depth();
for (size_t i = 0; i < n; ++i)
if (dit[i].inset().editable() != InsetBase::HIGHLY_EDITABLE) {
dit.resize(i);
break;
}
setCursor(dit);
// Note: return bottom (document) level pit.
return boost::make_tuple(cursor_.bottom().pit(), cursor_.bottom().pos(), top_id);
}