Use MathML on the clipboard for formulas in HTML

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 30ba5b63afc379c5af77090e95f370f6279e4386..96b7c35ea798c91a7a2726a0d28c1f61a82b694e 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,23 +12,45 @@
 
 #include "WordList.h"
 
+#include "Language.h"
+
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
 #include "support/weighted_btree.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
+
+#include <map>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-WordList theGlobalWordList;
+map<Language, WordList *> theGlobalWordList;
 
-WordList & theWordList()
+
+WordList * theWordList(Language const & lang)
 {
-       return theGlobalWordList;
+       map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
+       if (it != theGlobalWordList.end())
+               return it->second;
+       else
+               theGlobalWordList[lang] = new WordList;
+       return theGlobalWordList[lang];
 }
 
+
+void WordList::cleanupWordLists()
+{
+       map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
+       for (; it != theGlobalWordList.end(); ++it)
+               delete it->second;
+       theGlobalWordList.clear();
+}
+
+
 ///
 struct WordList::Impl {
        ///
@@ -62,8 +84,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(), /**/);
+       
+       // 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();
 }