Helge's infamous brackets bug

[lyx.git] / src / FontIterator.C

diff --git a/src/FontIterator.C b/src/FontIterator.C
index eeaadd0ffcb17453a93a0259f0fb4d3030775d01..ac3f52170d6b6c2cf9dde1fbbc8d13c2eae3d160 100644 (file)
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -22,12 +22,12 @@ FontIterator::FontIterator(LyXText const & text, Paragraph const & par,
                           lyx::pos_type pos)
        : text_(text), par_(par), pos_(pos),
          font_(text.getFont(par, pos)),
-         endspan_(par.getEndPosOfFontSpan(pos)),
+         endspan_(par.fontSpan(pos).last),
          bodypos_(par.beginOfBody())
 {}
 
 
-LyXFont FontIterator::operator*() const
+LyXFont const & FontIterator::operator*() const
 {
        return font_;
 }
@@ -44,7 +44,7 @@ FontIterator & FontIterator::operator++()
        ++pos_;
        if (pos_ > endspan_ || pos_ == bodypos_) {
                font_ = text_.getFont(par_, pos_);
-               endspan_ = par_.getEndPosOfFontSpan(pos_);
+               endspan_ = par_.fontSpan(pos_).last;
        }
        return *this;
 }