X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=d017db0cae115dfcad8ff041461c2607e582a59c;hb=02e82157ec583c3900e359de86be79fac6512387;hp=a6b2ae2ac45c6a3df968beb24e2212b6a70e341e;hpb=67805de7de949dbe8fd1468f4d17fc44f4171721;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index a6b2ae2ac4..d017db0cae 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2345,14 +2345,8 @@ int BufferView::scrollUp(int offset)
 
 bool BufferView::setCursorFromRow(int row)
 {
-	return setCursorFromRow(row, buffer_.texrow());
-}
-
-
-bool BufferView::setCursorFromRow(int row, TexRow const & texrow)
-{
-	TextEntry start, end;
-	tie(start,end) = texrow.getEntriesFromRow(row);
+	TexRow::TextEntry start, end;
+	tie(start,end) = buffer_.texrow().getEntriesFromRow(row);
 	LYXERR(Debug::LATEX,
 	       "setCursorFromRow: for row " << row << ", TexRow has found "
 	       "start (id=" << start.id << ",pos=" << start.pos << "), "
@@ -2361,7 +2355,8 @@ bool BufferView::setCursorFromRow(int row, TexRow const & texrow)
 }
 
 
-bool BufferView::setCursorFromEntries(TextEntry start, TextEntry end)
+bool BufferView::setCursorFromEntries(TexRow::TextEntry start,
+                                      TexRow::TextEntry end)
 {
 	DocIterator dit_start, dit_end;
 	tie(dit_start,dit_end) =
@@ -2809,19 +2804,7 @@ Point BufferView::coordOffset(DocIterator const & dit) const
 		}
 
 		// remember width for the case that sl.inset() is positioned in an RTL inset
-		if (i && dit[i - 1].text()) {
-			// If this Inset is inside a Text Inset, retrieve the Dimension
-			// from the containing text instead of using Inset::dimension() which
-			// might not be implemented.
-			// FIXME (Abdel 23/09/2007): this is a bit messy because of the
-			// elimination of Inset::dim_ cache. This coordOffset() method needs
-			// to be rewritten in light of the new design.
-			Dimension const & dim = coordCache().getInsets().dim(&sl.inset());
-			lastw = dim.wid;
-		} else {
-			Dimension const dim = sl.inset().dimension(*this);
-			lastw = dim.wid;
-		}
+		lastw = sl.inset().dimension(*this).wid;
 
 		//lyxerr << "Cursor::getPos, i: "
 		// << i << " x: " << xx << " y: " << y << endl;
@@ -2896,7 +2879,7 @@ bool BufferView::paragraphVisible(DocIterator const & dit) const
 void BufferView::cursorPosAndHeight(Point & p, int & h) const
 {
 	Cursor const & cur = cursor();
-	Font const font = cur.getFont();
+	Font const font = cur.real_current_font;
 	frontend::FontMetrics const & fm = theFontMetrics(font);
 	int const asc = fm.maxAscent();
 	int const des = fm.maxDescent();