From 6635cee7ce9390401f581a09eb3e301c9cf24c4a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 27 Feb 2002 14:02:10 +0000 Subject: [PATCH] remove redundant code (from Martin) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3597 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/text2.C | 22 +++++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9c1408d375..5d6e0e4ba7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-02-27 Martin Vermeer + + * text2.C (setLayout): get rid of redundant code + 2002-02-26 Martin Vermeer * text2.C (incDepth): make sure depth cannot be increased beyond diff --git a/src/text2.C b/src/text2.C index d97b44c865..718e9af3a1 100644 --- a/src/text2.C +++ b/src/text2.C @@ -547,7 +547,7 @@ Paragraph * LyXText::setLayout(BufferView * bview, LyXLayout const & lyxlayout = textclasslist.Style(bview->buffer()->params.textclass, layout); - while (cur.par() != send_cur.par()) { + do { cur.par()->setLayout(layout); makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); Paragraph * fppar = cur.par(); @@ -564,22 +564,10 @@ Paragraph * LyXText::setLayout(BufferView * bview, delete fppar->bibkey; fppar->bibkey = 0; } - cur.par(cur.par()->next()); - } - cur.par()->setLayout(layout); - makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); - Paragraph * fppar = cur.par(); - fppar->params().spaceTop(lyxlayout.fill_top ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); - fppar->params().spaceBottom(lyxlayout.fill_bottom ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); - if (lyxlayout.margintype == MARGIN_MANUAL) - cur.par()->setLabelWidthString(lyxlayout.labelstring()); - if (lyxlayout.labeltype != LABEL_BIBLIO - && fppar->bibkey) { - delete fppar->bibkey; - fppar->bibkey = 0; - } + if (cur.par() != send_cur.par()) + cur.par(cur.par()->next()); + } while (cur.par() != send_cur.par()); + return endpar; } -- 2.39.2