ctests: ignore check_load/templates/attic/latex8

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 2f8ce2bd524848245933ab5a2dad624235517f20..762e1b93c620411af87688dea91cbe0267eb2612 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -30,16 +30,27 @@ namespace lyx {
 ///
 map<Language, WordList *> theGlobalWordList;
 
+
 WordList * theWordList(Language const & lang)
 {
        map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
        if (it != theGlobalWordList.end())
                return it->second;
        else
-               theGlobalWordList[lang] = new WordList();
+               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 {
        ///
@@ -73,7 +84,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.