X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordList.cpp;h=16f3b92e86e49c08c3f6c079d350f24f439a52ce;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=30ba5b63afc379c5af77090e95f370f6279e4386;hpb=cd5bad62e039629d0642550b9cd64358104b0c66;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 30ba5b63af..16f3b92e86 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -15,20 +15,53 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
 #include "support/weighted_btree.h"
 
-#include <boost/assert.hpp>
+#include <QThreadStorage>
+
+#include <map>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-WordList theGlobalWordList;
+typedef map<string, WordList *> GlobalWordList;
+// Each thread uses its own word list, but only the one of the GUI thread is
+// used to do real work. The others are only neded to prevent simultanous
+// write access e.g. from a cloned buffer and a true document buffer.
+QThreadStorage<GlobalWordList *> theGlobalWordList;
+
+
+WordList * theWordList(string const & lang)
+{
+	if (!theGlobalWordList.hasLocalData())
+		theGlobalWordList.setLocalData(new GlobalWordList);
+	GlobalWordList * globalWordList = theGlobalWordList.localData();
+	GlobalWordList::iterator it = globalWordList->find(lang);
+	if (it != globalWordList->end())
+		return it->second;
+	else {
+		WordList * wl = new WordList;
+		(*globalWordList)[lang] = wl;
+		return wl;
+	}
+}
 
-WordList & theWordList()
+
+void WordList::cleanupWordLists()
 {
-	return theGlobalWordList;
+	if (!theGlobalWordList.hasLocalData())
+		return;
+	GlobalWordList * globalWordList = theGlobalWordList.localData();
+	GlobalWordList::const_iterator it = globalWordList->begin();
+	for (; it != globalWordList->end(); ++it)
+		delete it->second;
+	globalWordList->clear();
 }
 
+
 ///
 struct WordList::Impl {
 	///
@@ -62,8 +95,13 @@ WordList::~WordList()
 docstring const & WordList::word(size_t idx) const
 {
 	Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
-	BOOST_ASSERT(it != d->words_.end());
-	return it->first;
+	LASSERT(it != d->words_.end(), { static docstring dummy; return dummy; });
+	
+	// We use the key() method here, and not something like it->first
+	// because the btree only returns (iterator-) temporary value pairs.
+	// If we returned the first component of those here, we get an
+	// invalid reference and therefore strange crashes.
+	return it.key();
 }