From b3b6fc643df4904ff4bfe370998d57b41bdc7ae1 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sun, 18 May 2014 10:43:32 +0200 Subject: [PATCH] #8849 catch exception in enchant speller backend and avoid multiple speller lookups for missing dictionaries --- src/EnchantChecker.cpp | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) 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)) - // 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; + try { + m.speller = instance->request_dict(lang); } - // FIXME error handling? - return 0; + catch (const enchant::Exception & e) { + // FIXME error handling? + m.speller = 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(); } }