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

isWordSeparator crashes when checking end-of-paragraph

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37369 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2011-01-30 07:17:48 +00:00
parent ab9548d06d
commit e5f51200a3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Paragraph.cpp
View File

@ -2847,11 +2847,12 @@ bool Paragraph::isWordSeparator(pos_type pos) const
{ {
if (Inset const * inset = getInset(pos)) if (Inset const * inset = getInset(pos))
return !inset->isLetter(); return !inset->isLetter();
if (pos == size())
return true;
char_type const c = d->text_[pos]; char_type const c = d->text_[pos];
// We want to pass the ' and escape chars to the spellchecker // We want to pass the ' and escape chars to the spellchecker
static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\''); static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c)) return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c));
|| pos == size();
} }
@ -3766,7 +3767,9 @@ void Paragraph::spellCheck() const
bool Paragraph::isMisspelled(pos_type pos, bool check_boundary) const bool Paragraph::isMisspelled(pos_type pos, bool check_boundary) const
{ {
bool result = SpellChecker::misspelled(d->speller_state_.getState(pos)); bool result = SpellChecker::misspelled(d->speller_state_.getState(pos));
if (!result && check_boundary && pos > 0 && isWordSeparator(pos)) if (result || pos <= 0 || pos >= size())
return result;
if (check_boundary && isWordSeparator(pos))
result = SpellChecker::misspelled(d->speller_state_.getState(pos - 1)); result = SpellChecker::misspelled(d->speller_state_.getState(pos - 1));
return result; return result;
} }