X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=ef81e683aed532eb86d148b4bfcad49feb79c652;hb=27d580b5c057d565b9b4b50c811f6e1fab7f1246;hp=61f9caf416790ce456d124b3c520185cee1339dd;hpb=6ee19b2a543df0633d5b1a2a87aa83f2d2a2a533;p=lyx.git

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 61f9caf416..ef81e683ae 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -680,20 +680,18 @@ void RowPainter::paintLast()
 		FontInfo const font = labelFont();
 		FontMetrics const & fm = theFontMetrics(font);
 		docstring const & str = par_.layout().endlabelstring();
-		double const x = is_rtl ? 
-			text_metrics_.width() - row_.width() - fm.width(str) : x_;
+		double const x = is_rtl ? x_ - fm.width(str) : x_;
 		pi_.pain.text(int(x), yo_, str, font);
 		break;
 	}
 
 	case END_LABEL_NO_LABEL:
-		if (lyxrc.paragraph_markers) {
+		if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
 			docstring const s = docstring(1, char_type(0x00B6));
 			FontInfo f = FontInfo();
 			FontMetrics const & fm = theFontMetrics(f);
-			double const x = x_;
 			f.setColor(Color_paragraphmarker);
-			pi_.pain.text(int(x), yo_, s, f);
+			pi_.pain.text(int(x_), yo_, s, f);
 			x_ += fm.width(s);
 		}
 		break;