From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sat, 27 Apr 2013 18:00:15 +0000 (+0200)
Subject: Get rid of annoying warning message
X-Git-Tag: 2.1.0beta1~338
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f5ad0c128aec44f564497cfd275e21cb0a6ddc66;p=lyx.git

Get rid of annoying warning message
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index e5a469f5af..75bf9f838a 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1832,8 +1832,14 @@ Font const & Paragraph::getFontSettings(BufferParams const & bparams,
 FontSpan Paragraph::fontSpan(pos_type pos) const
 {
 	LBUFERR(pos <= size(), _("Invalid position"));
-	pos_type start = 0;
 
+	// Last position is a special case. I suspect that it would
+	// actually make sense to extend the last font span to cover
+	// the last character (JMarc)
+	if (pos == size())
+		return FontSpan(pos, pos);
+
+	pos_type start = 0;
 	FontList::const_iterator cit = d->fontlist_.begin();
 	FontList::const_iterator end = d->fontlist_.end();
 	for (; cit != end; ++cit) {
@@ -1850,8 +1856,8 @@ FontSpan Paragraph::fontSpan(pos_type pos) const
 	}
 
 	// This should not happen, but if so, we take no chances.
-	LYXERR0("Paragraph::getEndPosOfFontSpan: This should not happen!");
-	return FontSpan(pos, pos);
+	LYXERR0("Paragraph::fontSpan: position not found in fontinfo table!");
+	LASSERT(false, return FontSpan(pos, pos));
 }