remove redundant code (from Martin)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3597 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c1408d37587d2f598106f085a56d81b02ccef67..5d6e0e4ba75f1e9f8914d21ec18fe5f2fe206bb0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-27  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * text2.C (setLayout): get rid of redundant code
+
 2002-02-26  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * text2.C (incDepth): make sure depth cannot be increased beyond

diff --git a/src/text2.C b/src/text2.C
index d97b44c8654e015816016939734d698a6eef9b97..718e9af3a1290eb832c1c626082851c49e67f78c 100644 (file)
--- 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;
 }