fix MSVC warning.

[lyx.git] / src / FontList.cpp

diff --git a/src/FontList.cpp b/src/FontList.cpp
index b512578fec6ce63ea371720f89d06d417fcd7bae..7d46e8bf0ccd04876595ccde67bb7a31223ee060 100644 (file)
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -66,7 +66,7 @@ Font & FontList::get(pos_type pos)
 {
        iterator end = list_.end();
        iterator it = fontIterator(pos);
-       if (it != end && it->pos == pos)
+       if (it != end && it->pos() == pos)
                return it->font_;
        static Font dummy;
        return dummy;
@@ -80,19 +80,21 @@ void FontList::erase(pos_type pos)
        iterator beg = list_.begin();
        if (it != list_.end() && it->pos() == pos
                && (pos == 0 
-                       || (it != beg && boost::prior(it)->pos() == pos - 1))) {
+                       || (it != list_.begin() && boost::prior(it)->pos() == pos - 1))) {
 
                // If it is a multi-character font
                // entry, we just make it smaller
                // (see update below), otherwise we
                // should delete it.
-               unsigned int const i = it - beg;
-               list_.erase(beg + i);
-               it = beg + i;
+               unsigned int const i = it - list_.begin();
+               list_.erase(it);
+               if (i >= list_.size())
+                       return;
+               it = list_.begin() + i;
                if (i > 0 && i < list_.size() &&
                    list_[i - 1].font() == list_[i].font()) {
                        list_.erase(beg + i - 1);
-                       it = beg + i - 1;
+                       it = list_.begin() + i - 1;
                }
        }
 
@@ -211,4 +213,29 @@ Font_size FontList::highestInRange
        return maxsize;
 }
 
+
+bool FontList::hasChangeInRange(pos_type pos, int len) const
+{
+       // FIXME: can't we use fontIterator(pos) instead?
+       const_iterator cit = list_.begin();
+       const_iterator end = list_.end();
+       for (; cit != end; ++cit) {
+               if (cit->pos() >= pos)
+                       break;
+       }
+       if (cit != end && pos + len - 1 > cit->pos())
+               return false;
+
+       return true;
+}
+
+
+void FontList::validate(LaTeXFeatures & features) const
+{
+       const_iterator fcit = list_.begin();
+       const_iterator fend = list_.end();
+       for (; fcit != fend; ++fcit)
+               fcit->font().validate(features);
+}
+
 } // namespace lyx