X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.C;h=ac3f52170d6b6c2cf9dde1fbbc8d13c2eae3d160;hb=e2cd4d4c44f7c604a45dd9de9c9ade0d7c09eefc;hp=17cb08763a2a8b676b234bd26cc4e1d2f1d1e2fb;hpb=ed064bdee611821c1ebdac78b7a085dfde9f0b5a;p=lyx.git

diff --git a/src/FontIterator.C b/src/FontIterator.C
index 17cb08763a..ac3f52170d 100644
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -18,16 +18,16 @@
 #include "paragraph.h"
 
 
-FontIterator::FontIterator(LyXText const & text, lyx::pit_type pit,
+FontIterator::FontIterator(LyXText const & text, Paragraph const & par,
 			   lyx::pos_type pos)
-	: text_(text), pit_(pit), pos_(pos),
-	  font_(text.getFont(text.getPar(pit), pos)),
-	  endspan_(text.getPar(pit).getEndPosOfFontSpan(pos)),
-	  bodypos_(text.getPar(pit).beginOfBody())
+	: text_(text), par_(par), pos_(pos),
+	  font_(text.getFont(par, pos)),
+	  endspan_(par.fontSpan(pos).last),
+	  bodypos_(par.beginOfBody())
 {}
 
 
-LyXFont FontIterator::operator*() const
+LyXFont const & FontIterator::operator*() const
 {
 	return font_;
 }
@@ -43,8 +43,8 @@ FontIterator & FontIterator::operator++()
 {
 	++pos_;
 	if (pos_ > endspan_ || pos_ == bodypos_) {
-		font_ = text_.getFont(text_.getPar(pit_), pos_);
-		endspan_ = text_.getPar(pit_).getEndPosOfFontSpan(pos_);
+		font_ = text_.getFont(par_, pos_);
+		endspan_ = par_.fontSpan(pos_).last;
 	}
 	return *this;
 }