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

#9477 improved argument handling for LFUN_SPELLING_ADD,LFUN_SPELLING_IGNORE and LFUN_SPELLING_REMOVE

Browse Source
This commit is contained in:
Stephan Witt 2015-03-27 08:07:05 +01:00
parent e4fe294bdc
commit 73242e0052
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Text3.cpp
View File

@ -2290,8 +2290,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
word = cur.selectionAsString(false);
}
lang = const_cast<Language *>(cur.getFont().language());
} else
} else if (cmd.getArg(1).empty()) {
// optional language argument is missing
// use the language at cursor position
lang = const_cast<Language *>(cur.getFont().language());
} else {
lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
}
WordLangTuple wl(word, lang);
theSpellChecker()->insert(wl);
break;
@ -2309,8 +2314,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
word = cur.selectionAsString(false);
}
lang = const_cast<Language *>(cur.getFont().language());
} else
} else if (cmd.getArg(1).empty()) {
lang = const_cast<Language *>(cur.getFont().language());
} else {
lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
}
WordLangTuple wl(word, lang);
theSpellChecker()->accept(wl);
break;
@ -2328,8 +2336,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
word = cur.selectionAsString(false);
}
lang = const_cast<Language *>(cur.getFont().language());
} else
} else if (cmd.getArg(1).empty()) {
lang = const_cast<Language *>(cur.getFont().language());
} else {
lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
}
WordLangTuple wl(word, lang);
theSpellChecker()->remove(wl);
break;
@ -3011,7 +3022,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_SPELLING_ADD:
case LFUN_SPELLING_IGNORE:
case LFUN_SPELLING_REMOVE:
enable = theSpellChecker();
enable = theSpellChecker() != NULL;
if (enable && !cmd.getArg(1).empty()) {
// validate explicitly given language
Language const * const lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
enable &= lang != NULL;
}
break;
case LFUN_LAYOUT: {