From 8c99d7227e43e3cd6cc74a4ebb69c18c6b729691 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Tue, 22 Apr 2008 18:30:43 +0000 Subject: [PATCH] Fix bug 4576. Bug was mixed up with Empty Layout stuff. It was not always easy for me to know then which test I needed to do, but if there are more of these, they'll be similar. Anyway, the right test here would have been: if (!par->forceEmptyLayout()) but in fact things can be simplified more. Cosmetics will follow. This patch makes the action more obvious. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24453 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/output_latex.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 7e99809ccb..cc93a1709c 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -309,11 +309,6 @@ TeXOnePar(Buffer const & buf, return nextpit; } - // FIXME This comment doesn't make sense. What's the - // length got to do with forceEmptyLayout()? I.e., what - // was forceDefaultParagraphs()? - // In an inset with unlimited length (all in one row), - // force layout to default Layout const style = pit->forceEmptyLayout() ? bparams.documentClass().emptyLayout() : pit->layout(); @@ -783,12 +778,6 @@ void latexParagraphs(Buffer const & buf, // if only_body while (par != endpar) { lastpar = par; - // well we have to check if we are in an inset with unlimited - // length (all in one row) if that is true then we don't allow - // any special options in the paragraph and also we don't allow - // any environment other than the default layout of the - // text class to be valid! - if (par->allowParagraphCustomization()) { Layout const & layout = par->forceEmptyLayout() ? tclass.emptyLayout() : par->layout(); @@ -832,9 +821,6 @@ void latexParagraphs(Buffer const & buf, par = TeXOnePar(buf, text, par, os, texrow, runparams, everypar); } - } else { - par = TeXOnePar(buf, text, par, os, texrow, - runparams, everypar); } if (distance(lastpar, par) >= distance(lastpar, endpar)) break; -- 2.39.2