X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=77c9e309ed1c79fbb60ec94f5e266e5741ddf971;hb=1a48d5a96712c72879487542e3f1a7e61ce3f78c;hp=793bc16fb95da8499743b6c8bc4fc26645ff3ee7;hpb=e4f2484cb5899da6d98e0be6db465ca011989e04;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 793bc16fb9..77c9e309ed 100644
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -40,7 +40,8 @@ typedef map<string, Speller> 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()
@@ -113,6 +113,9 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 	enchant::Dict * m = d->speller(word.lang()->code());
 
 	if (!m)
+		return NO_DICTIONARY;
+
+	if (word.word().empty())
 		return WORD_OK;
 
 	string utf8word = to_utf8(word.word());
@@ -124,19 +127,39 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & 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();
+	}
 }
 
 
@@ -168,6 +191,12 @@ bool EnchantChecker::hasDictionary(Language const * lang) const
 }
 
 
+int EnchantChecker::numDictionaries() const
+{
+	return d->spellers_.size();
+}
+	
+
 docstring const EnchantChecker::error()
 {
 	return docstring();