X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=77c9e309ed1c79fbb60ec94f5e266e5741ddf971;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=8cc37812b4c7e558c57331bde91b63c98611b11b;hpb=dec437fbac739fb4d8e78842b9f9286bbaaf0971;p=lyx.git diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp index 8cc37812b4..77c9e309ed 100644 --- a/src/EnchantChecker.cpp +++ b/src/EnchantChecker.cpp @@ -40,7 +40,8 @@ typedef map Spellers; struct EnchantChecker::Private { - Private() {} + Private() + {} ~Private(); @@ -60,9 +61,8 @@ EnchantChecker::Private::~Private() Spellers::iterator it = spellers_.begin(); Spellers::iterator end = spellers_.end(); - for (; it != end; ++it) { + for (; it != end; ++it) delete it->second.speller; - } } @@ -97,9 +97,9 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang) } -EnchantChecker::EnchantChecker(): d(new Private) -{ -} +EnchantChecker::EnchantChecker() + : d(new Private) +{} EnchantChecker::~EnchantChecker() @@ -112,7 +112,10 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word) { enchant::Dict * m = d->speller(word.lang()->code()); - if (!m || word.word().empty()) + if (!m) + return NO_DICTIONARY; + + if (word.word().empty()) return WORD_OK; string utf8word = to_utf8(word.word()); @@ -138,6 +141,16 @@ void EnchantChecker::insert(WordLangTuple const & word) advanceChangeNumber(); } } + + +void EnchantChecker::remove(WordLangTuple const & word) +{ + Spellers::iterator it = d->spellers_.find(word.lang()->code()); + if (it != d->spellers_.end()) { + it->second.speller->remove(to_utf8(word.word())); + advanceChangeNumber(); + } +} void EnchantChecker::accept(WordLangTuple const & word) @@ -178,6 +191,12 @@ bool EnchantChecker::hasDictionary(Language const * lang) const } +int EnchantChecker::numDictionaries() const +{ + return d->spellers_.size(); +} + + docstring const EnchantChecker::error() { return docstring();