X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=dc8ea4d864af9e9ff5a589a0a840583ac4f803b5;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=179e8365a584a6adc6ccab230d30445ae9b126d7;hpb=5a80aa6fcfe80b69bff0c891a699fff590cbaaad;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 179e8365a5..dc8ea4d864 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,30 +61,29 @@ 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;
-	}
 }
 
 
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
 	enchant::Broker * instance = enchant::Broker::instance();
+	Speller m;
 
-	if (!instance->dict_exists(lang))
+	try {
+		LYXERR(Debug::FILES, "request enchant speller for language " << lang);
+		m.speller = instance->request_dict(lang);
+	}
+	catch (enchant::Exception & e) {
 		// FIXME error handling?
-		return 0;
-
-	enchant::Dict * dict = instance->request_dict(lang);
-
-	if (dict) {
-		Speller m;
-		m.speller = dict;
-		spellers_[lang] = m;
-		return m.speller;
+		const char * what = e.what();
+		LYXERR(Debug::FILES, "cannot add enchant speller: " <<
+			   ((what && *what) ? what : "unspecified enchant exception in request_dict()"));
+		m.speller = 0;
 	}
-	// FIXME error handling?
-	return 0;
+	spellers_[lang] = m;
+	return m.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());
@@ -132,9 +135,9 @@ void EnchantChecker::advanceChangeNumber()
 
 void EnchantChecker::insert(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang()->code());
-	if (it != d->spellers_.end()) {
-		it->second.speller->add(to_utf8(word.word()));
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->add(to_utf8(word.word()));
 		advanceChangeNumber();
 	}
 }
@@ -142,9 +145,9 @@ void EnchantChecker::insert(WordLangTuple const & word)
 	
 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()));
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->remove(to_utf8(word.word()));
 		advanceChangeNumber();
 	}
 }
@@ -152,9 +155,9 @@ void EnchantChecker::remove(WordLangTuple const & word)
 
 void EnchantChecker::accept(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang()->code());
-	if (it != d->spellers_.end()) {
-		it->second.speller->add_to_session(to_utf8(word.word()));
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->add_to_session(to_utf8(word.word()));
 		advanceChangeNumber();
 	}
 }