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

backport fix for #7661 to branch - check buffer of cursors before using compare operator - avoid assertion

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39245 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2011-07-04 18:39:25 +00:00
parent 692ae99588
commit ed140e7343
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/qt4/GuiSpellchecker.cpp
View File

@ -79,6 +79,8 @@ struct SpellcheckerWidget::Private
return false;
}
void canCheck() { incheck_ = false; }
/// check for wrap around of current position
bool isWrapAround(DocIterator cursor) const;
///
Ui::SpellcheckerUi ui;
///
@ -200,6 +202,11 @@ bool SpellcheckerWidget::Private::continueFromBeginning()
return true;
}
bool SpellcheckerWidget::Private::isWrapAround(DocIterator cursor) const
{
return wrap_around_ && start_.buffer() == cursor.buffer() && start_ < cursor;
}
void SpellcheckerWidget::Private::forward()
{
@ -216,7 +223,7 @@ void SpellcheckerWidget::Private::forward()
//FIXME we must be at the end of a cell
dispatch(FuncRequest(LFUN_CHAR_FORWARD));
}
if (wrap_around_ && start_ < bv->cursor()) {
if (isWrapAround(bv->cursor())) {
dv_->hide();
}
}
@ -397,7 +404,7 @@ void SpellcheckerWidget::Private::check()
return;
}
if (wrap_around_ && start_ < from) {
if (isWrapAround(from)) {
dv_->hide();
return;
}

3
status.20x
View File

@ -198,6 +198,9 @@ What's new
- Don't assert when accepting/rejecting non-existent changes (bug 7654).
- Fix assertion when using "Ignore All" in spell checker dialog
after changing buffer view (bug 7661).
* ADVANCED FIND AND REPLACE