X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=47eb35e52ec208eaa331a5ecaba3786c65e20212;hb=a41d589e851a956ff27235841e6330bab552c0fe;hp=6b53d2bac568626869012ebad9b43ea03b33b558;hpb=5c90303c0ae4cb7a6e3944097d4ec673a9ecbd6d;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 6b53d2bac5..47eb35e52e 100644
--- 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,17 +79,17 @@ EnchantChecker::Private::~Private()
 
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
-	enchant::Broker * instance = enchant::Broker::instance();
 	Speller m;
 
 	try {
 		LYXERR(Debug::FILES, "request enchant speller for language " << lang);
-		m.speller = instance->request_dict(lang);
+		m.speller = broker().request_dict(lang);
 	}
-	catch (const enchant::Exception & e) {
+	catch (enchant::Exception & e) {
 		// FIXME error handling?
-		// unfortunately the message of enchant::Exception is unreachable
-		LYXERR(Debug::FILES, "cannot add enchant speller, unspecified enchant exception in request_dict().");
+		const char * what = e.what();
+		LYXERR(Debug::FILES, "cannot add enchant speller: " <<
+			   ((what && *what) ? what : "unspecified enchant exception in request_dict()"));
 		m.speller = 0;
 	}
 	spellers_[lang] = m;
@@ -91,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);
 }
 
@@ -140,8 +151,8 @@ void EnchantChecker::insert(WordLangTuple const & word)
 		advanceChangeNumber();
 	}
 }
-	
-	
+
+
 void EnchantChecker::remove(WordLangTuple const & word)
 {
 	enchant::Dict * m = d->speller(word.lang()->code());
@@ -175,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));
 }
@@ -185,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());
 }
 
 
@@ -194,7 +204,7 @@ int EnchantChecker::numDictionaries() const
 {
 	return d->spellers_.size();
 }
-	
+
 
 docstring const EnchantChecker::error()
 {