anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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:

Browse Source 
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
This commit is contained in:
Richard Heck 2008-04-22 18:30:43 +00:00
parent 209e083b19
commit 8c99d7227e
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/output_latex.cpp
View File

@ -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;