Revert "Objective-C compililation support with cmake and C++11"

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 7dc620e0898e2fba99101d23a546021b118982bf..3a095afca230c3dba23bd0a93b9a3f14316f4671 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -15,20 +15,40 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
 #include "support/weighted_btree.h"
 
-#include "support/lassert.h"
+#include <map>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-WordList theGlobalWordList;
+typedef map<string, WordList *> GlobalWordList;
+GlobalWordList theGlobalWordList;
 
-WordList & theWordList()
+
+WordList * theWordList(string const & lang)
 {
-       return theGlobalWordList;
+       GlobalWordList::iterator it = theGlobalWordList.find(lang);
+       if (it != theGlobalWordList.end())
+               return it->second;
+       else
+               theGlobalWordList[lang] = new WordList;
+       return theGlobalWordList[lang];
 }
 
+
+void WordList::cleanupWordLists()
+{
+       GlobalWordList::const_iterator it = theGlobalWordList.begin();
+       for (; it != theGlobalWordList.end(); ++it)
+               delete it->second;
+       theGlobalWordList.clear();
+}
+
+
 ///
 struct WordList::Impl {
        ///
@@ -62,7 +82,7 @@ WordList::~WordList()
 docstring const & WordList::word(size_t idx) const
 {
        Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
-       LASSERT(it != d->words_.end(), /**/);
+       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.