X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordList.cpp;h=558ddf8a1872ff4b11d408fc1a33715453f59afd;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=5d4debf1e9df4173fcf1ea747e0f342e172b3c6f;hpb=1669c17c0fdc20ca12d0d2d30bad364b17a31e3d;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 5d4debf1e9..558ddf8a18 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -28,7 +28,7 @@ WordList & theWordList()
 {
 	return theGlobalWordList;
 }
-	
+
 ///
 struct WordList::Impl {
 	///
@@ -63,13 +63,18 @@ 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;
+	
+	// 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();
 }
 
 
 size_t WordList::size() const
 {
-	return d->words_.size();
+	return d->words_.summed_weight();
 }
 
 
@@ -78,8 +83,10 @@ void WordList::insert(docstring const & w)
 	Impl::Words::iterator it = d->words_.find(w);
 	if (it == d->words_.end())
 		d->words_.insert(w, size_t(1), 1);
-	else
+	else {
 		it.data()++;
+		d->words_.change_weight(it, 1);
+	}
 }
 
 
@@ -88,8 +95,12 @@ void WordList::remove(docstring const & w)
 	Impl::Words::iterator it = d->words_.find(w);
 	if (it != d->words_.end()) {
 		it.data()--;
-		if (it.data() == 0)
-			d->words_.erase(w);
+		d->words_.change_weight(it, 0);
+		// We will not erase here, but instead we just leave it
+		// in the btree with weight 0. This avoid too much
+		// reorganisation of the tree all the time.
+		//if (it.data() == 0)
+		//	d->words_.erase(w);
 	}
 }