X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FWordList.cpp;h=9bc52accea3461fd20f7d825d1a7e4e95519199b;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=30ba5b63afc379c5af77090e95f370f6279e4386;hpb=cd5bad62e039629d0642550b9cd64358104b0c66;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 30ba5b63af..9bc52accea 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -15,20 +15,39 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
+#include "support/unique_ptr.h"
 #include "support/weighted_btree.h"
 
-#include <boost/assert.hpp>
+#include <QThreadStorage>
+
+#include <map>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-WordList theGlobalWordList;
+typedef map<string, unique_ptr<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()
+
+WordList & theWordList(string const & lang)
 {
-	return theGlobalWordList;
+	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
+		return *(globalWordList[lang] = make_unique<WordList>());
 }
 
+
 ///
 struct WordList::Impl {
 	///
@@ -40,9 +59,8 @@ struct WordList::Impl {
 };
 
 
-WordList::WordList()
+WordList::WordList() : d(make_unique<Impl>())
 {
-	d = new Impl;
 	d->c_ = 0;
 
 #if 0
@@ -53,17 +71,16 @@ WordList::WordList()
 }
 
 
-WordList::~WordList()
-{
-	delete d;
-}
-
-
 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();
 }