Provide proper fallback if a bibliography processor is not found

[lyx.git] / src / EnchantChecker.cpp

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 77c9e309ed1c79fbb60ec94f5e266e5741ddf971..47eb35e52ec208eaa331a5ecaba3786c65e20212 100644 (file)
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -30,13 +30,24 @@ namespace lyx {
 
 namespace {
 
+enchant::Broker & broker()
+{
+#ifdef HAVE_ENCHANT2
+       static enchant::Broker thebroker;
+       return thebroker;
+#else
+       return *enchant::Broker::instance();
+#endif
+}
+
+
 struct Speller {
        enchant::Dict * speller;
 };
 
 typedef map<string, Speller> Spellers;
-  
-} // anon namespace
+
+} // namespace
 
 struct EnchantChecker::Private
 {
@@ -68,22 +79,21 @@ 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 {
+               LYXERR(Debug::FILES, "request enchant speller for language " << lang);
+               m.speller = broker().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;
 }
 
 
@@ -92,7 +102,7 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang)
        Spellers::iterator it = spellers_.find(lang);
        if (it != spellers_.end())
                return it->second.speller;
-       
+
        return addSpeller(lang);
 }
 
@@ -135,19 +145,19 @@ 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();
        }
 }
-       
-       
+
+
 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 +165,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();
        }
 }
@@ -176,7 +186,7 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 
        vector<string> suggs = m->suggest(utf8word);
        vector<string>::const_iterator it = suggs.begin();
-       
+
        for (; it != suggs.end(); ++it)
                suggestions.push_back(from_utf8(*it));
 }
@@ -186,8 +196,7 @@ bool EnchantChecker::hasDictionary(Language const * lang) const
 {
        if (!lang)
                return false;
-       enchant::Broker * instance = enchant::Broker::instance();
-       return (instance->dict_exists(lang->code()));
+       return broker().dict_exists(lang->code());
 }
 
 
@@ -195,7 +204,7 @@ int EnchantChecker::numDictionaries() const
 {
        return d->spellers_.size();
 }
-       
+
 
 docstring const EnchantChecker::error()
 {