From: Stephan Witt <switt@lyx.org>
Date: Sun, 18 May 2014 08:43:32 +0000 (+0200)
Subject: #8849 catch exception in enchant speller backend and avoid multiple speller lookups... 
X-Git-Tag: 2.1.3~123
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3ca1a699184970a570137153529273912e219596;p=features.git

#8849 catch exception in enchant speller backend and avoid multiple speller lookups for missing dictionaries
---

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 77c9e309ed..b98cfdb929 100644
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -69,21 +69,17 @@ EnchantChecker::Private::~Private()
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
 	enchant::Broker * instance = enchant::Broker::instance();
+	Speller m;
 
-	if (!instance->dict_exists(lang))
+	try {
+		m.speller = instance->request_dict(lang);
+	}
+	catch (const 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;
+		m.speller = 0;
 	}
-	// FIXME error handling?
-	return 0;
+	spellers_[lang] = m;
+	return m.speller;
 }
 
 
@@ -135,9 +131,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();
 	}
 }
@@ -145,9 +141,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();
 	}
 }
@@ -155,9 +151,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();
 	}
 }