X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.C;h=ac3f52170d6b6c2cf9dde1fbbc8d13c2eae3d160;hb=8c93f63b48a1b15d4f3e163b7305213f2f73879e;hp=f4fe4ade5c6c5f85a681ebad1fd434f0c55b9a93;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/FontIterator.C b/src/FontIterator.C
index f4fe4ade5c..ac3f52170d 100644
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -6,7 +6,7 @@
  * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS.
- * 
+ *
  */
 
 
@@ -18,16 +18,16 @@
 #include "paragraph.h"
 
 
-FontIterator::FontIterator(LyXText const & text, lyx::par_type pit,
+FontIterator::FontIterator(LyXText const & text, Paragraph const & par,
 			   lyx::pos_type pos)
-	: text_(text), pit_(pit), pos_(pos),
-	  font_(text.getFont(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(pit_, pos_);
-		endspan_ = text_.getPar(pit_).getEndPosOfFontSpan(pos_);
+		font_ = text_.getFont(par_, pos_);
+		endspan_ = par_.fontSpan(pos_).last;
 	}
 	return *this;
 }