X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordList.cpp;h=762e1b93c620411af87688dea91cbe0267eb2612;hb=889182eb1a19da1cb4d5b5efeea434a5e6592ef0;hp=2f8ce2bd524848245933ab5a2dad624235517f20;hpb=3efb1572a24043c07a8e54689bd58c5fa7db97e1;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 2f8ce2bd52..762e1b93c6 100644
--- 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.