X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=61127108a44765e72a9f22ebe9ddb818844467b4;hb=b64d17e9dcaeb84a94095622c93a051e4d93eab7;hp=61becbcec86ef3b8e26378f2df493d75d72fa256;hpb=fd75ef23ae9166d20b4da2be9b1e2301b20e5166;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 61becbcec8..61127108a4 100644
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -34,7 +34,7 @@ struct Speller {
 	enchant::Dict * speller;
 };
 
-typedef std::map<std::string, Speller> Spellers;
+typedef map<string, Speller> Spellers;
   
 } // anon namespace
 
@@ -113,30 +113,53 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 	enchant::Dict * m = d->speller(word.lang()->code());
 
 	if (!m)
-		return OK;
+		return NO_DICTIONARY;
 
-	std::string utf8word(to_utf8(word.word()));
+	if (word.word().empty())
+		return WORD_OK;
+
+	string utf8word = to_utf8(word.word());
 
 	if (m->check(utf8word))
-		return OK;
+		return WORD_OK;
 
 	return UNKNOWN_WORD;
 }
 
 
+void EnchantChecker::advanceChangeNumber()
+{
+	nextChangeNumber();
+}
+
+
 void EnchantChecker::insert(WordLangTuple const & word)
 {
 	Spellers::iterator it = d->spellers_.find(word.lang()->code());
-	if (it != d->spellers_.end())
+	if (it != d->spellers_.end()) {
 		it->second.speller->add(to_utf8(word.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)
 {
 	Spellers::iterator it = d->spellers_.find(word.lang()->code());
-	if (it != d->spellers_.end())
+	if (it != d->spellers_.end()) {
 		it->second.speller->add_to_session(to_utf8(word.word()));
+		advanceChangeNumber();
+	}
 }
 
 
@@ -159,6 +182,21 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 }
 
 
+bool EnchantChecker::hasDictionary(Language const * lang) const
+{
+	if (!lang)
+		return false;
+	enchant::Broker * instance = enchant::Broker::instance();
+	return (instance->dict_exists(lang->code()));
+}
+
+
+int EnchantChecker::numDictionaries() const
+{
+	return d->spellers_.size();
+}
+	
+
 docstring const EnchantChecker::error()
 {
 	return docstring();