X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=d4ff656449ace627c47a9365e8bd51bb122f6da9;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=e6541fdb0b3090958fe89c035d9eb05b93cb98a1;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index e6541fdb0b..d4ff656449 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -42,6 +42,7 @@
 
 #include "support/lassert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
@@ -135,7 +136,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -154,7 +155,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -173,7 +174,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	RowList::const_iterator rit = rows_.end();
 	RowList::const_iterator const begin = rows_.begin();
@@ -245,7 +246,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	if (!par_->isHfill(pos))
 		return false;
 
-	LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
+	LASSERT(pos >= row.pos() && pos < row.endpos(), return false);
 
 	// expand at the end of a row only if there is another hfill on the same row
 	if (pos == row.endpos() - 1) {