Fix invalid iterator access

[lyx.git] / src / FontList.cpp

diff --git a/src/FontList.cpp b/src/FontList.cpp
index 240ca4d91ce6f184e328235c6e3882fad64f939b..ba6b79af05bc2738f67ac809984a6a1b72d5fd86 100644 (file)
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -53,13 +53,14 @@ FontList::const_iterator FontList::fontIterator(pos_type pos) const
 }
 
 
-Font & FontList::get(pos_type pos)
+Font const & FontList::get(pos_type pos)
 {
        iterator end = list_.end();
        iterator it = fontIterator(pos);
        if (it != end && it->pos() == pos)
                return it->font_;
-       static Font dummy;
+
+       static Font const dummy;
        return dummy;
 }
 
@@ -143,7 +144,7 @@ void FontList::set(pos_type pos, Font const & font)
        bool const end = found && list_[i].pos() == pos;
 
        if (!begin && !end) {
-               // The general case: The block is splitted into 3 blocks
+               // The general case: The block is split into 3 blocks
                list_.insert(list_.begin() + i,
                                FontTable(pos - 1, list_[i].font()));
                list_.insert(list_.begin() + i + 1,
@@ -181,23 +182,6 @@ void FontList::set(pos_type pos, Font const & font)
 }
 
 
-void FontList::setMisspelled(pos_type startpos, pos_type endpos,
-       bool misspelled)
-{
-       if (list_.empty())
-               return;
-
-       List::iterator end_it = fontIterator(endpos);
-       List::iterator const end = list_.end();
-       if (end_it != end)
-               ++end_it;
-
-       List::iterator cit = fontIterator(startpos);
-       for (; cit != end_it; ++cit)
-               cit->font_.setMisspelled(misspelled);
-}
-
-
 FontSize FontList::highestInRange(pos_type startpos, pos_type endpos,
        FontSize def_size) const
 {