X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=a38fe6e8c6b6bc507920ba0b0732800e0a56c46f;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=a37ee9b3a01cda4d69f3f07919462b7c36eceb15;hpb=102266cf922b4a62c9ce33635b67e98a8872c004;p=lyx.git

diff --git a/src/paragraph.C b/src/paragraph.C
index a37ee9b3a0..a38fe6e8c6 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -519,9 +519,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 
 	LyXLayout_ptr const & lout = layout();
 
-	pos_type main_body = 0;
-	if (lout->labeltype == LABEL_MANUAL)
-		main_body = beginningOfMainBody();
+	pos_type const main_body = beginningOfMainBody();
 
 	LyXFont layoutfont;
 	if (pos < main_body)
@@ -866,6 +864,9 @@ void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
 
 int Paragraph::beginningOfMainBody() const
 {
+	if (layout()->labeltype != LABEL_MANUAL)
+		return 0;
+
 	// Unroll the first two cycles of the loop
 	// and remember the previous character to
 	// remove unnecessary GetChar() calls
@@ -1356,10 +1357,14 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
 	// Maybe we have to create a optional argument.
 	pos_type main_body;
-	if (style->labeltype != LABEL_MANUAL)
+
+	// FIXME: can we actually skip this check and just call
+	// beginningOfMainBody() ??
+	if (style->labeltype != LABEL_MANUAL) {
 		main_body = 0;
-	else
+	} else {
 		main_body = beginningOfMainBody();
+	}
 
 	unsigned int column = 0;