X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=4e9494ad2a9964d49735fc87952ec1112b2a0482;hb=604a3341d9bd6b6bee6f042292f28b89027ca2b5;hp=23cbee923e55f48ed7ffd81d7aa019ab8d43ae5a;hpb=7746747506617b952e04e2e805c3688f4fef5256;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 23cbee923e..4e9494ad2a 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
 
@@ -69,6 +69,11 @@ EnchantChecker::Private::~Private()
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
 	enchant::Broker * instance = enchant::Broker::instance();
+
+	if (!instance->dict_exists(lang))
+		// FIXME error handling?
+		return 0;
+
 	enchant::Dict * dict = instance->request_dict(lang);
 
 	if (dict) {
@@ -105,15 +110,15 @@ EnchantChecker::~EnchantChecker()
 
 SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 {
-	enchant::Dict * m = d->speller(word.lang_code());
+	enchant::Dict * m = d->speller(word.lang()->code());
 
-	if (!m)
-		return OK;
+	if (!m || word.word().empty())
+		return WORD_OK;
 
-	std::string utf8word(to_utf8(word.word()));
+	string utf8word = to_utf8(word.word());
 
 	if (m->check(utf8word))
-		return OK;
+		return WORD_OK;
 
 	return UNKNOWN_WORD;
 }
@@ -121,7 +126,7 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 
 void EnchantChecker::insert(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang_code());
+	Spellers::iterator it = d->spellers_.find(word.lang()->code());
 	if (it != d->spellers_.end())
 		it->second.speller->add(to_utf8(word.word()));
 }
@@ -129,7 +134,7 @@ void EnchantChecker::insert(WordLangTuple const & word)
 
 void EnchantChecker::accept(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang_code());
+	Spellers::iterator it = d->spellers_.find(word.lang()->code());
 	if (it != d->spellers_.end())
 		it->second.speller->add_to_session(to_utf8(word.word()));
 }
@@ -139,7 +144,7 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 	docstring_list & suggestions)
 {
 	suggestions.clear();
-	enchant::Dict * m = d->speller(wl.lang_code());
+	enchant::Dict * m = d->speller(wl.lang()->code());
 
 	if (!m)
 		return;
@@ -154,6 +159,15 @@ 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()));
+}
+
+
 docstring const EnchantChecker::error()
 {
 	return docstring();