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

remove redundant code (from Martin)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3597 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-02-27 14:02:10 +00:00
parent 3b041cc66d
commit 6635cee7ce
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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> 2002-02-26 Martin Vermeer <martin.vermeer@hut.fi>
* text2.C (incDepth): make sure depth cannot be increased beyond * text2.C (incDepth): make sure depth cannot be increased beyond

22
src/text2.C
View File

@ -547,7 +547,7 @@ Paragraph * LyXText::setLayout(BufferView * bview,
LyXLayout const & lyxlayout = LyXLayout const & lyxlayout =
textclasslist.Style(bview->buffer()->params.textclass, layout); textclasslist.Style(bview->buffer()->params.textclass, layout);
while (cur.par() != send_cur.par()) { do {
cur.par()->setLayout(layout); cur.par()->setLayout(layout);
makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
Paragraph * fppar = cur.par(); Paragraph * fppar = cur.par();
@ -564,22 +564,10 @@ Paragraph * LyXText::setLayout(BufferView * bview,
delete fppar->bibkey; delete fppar->bibkey;
fppar->bibkey = 0; fppar->bibkey = 0;
} }
cur.par(cur.par()->next()); if (cur.par() != send_cur.par())
} cur.par(cur.par()->next());
cur.par()->setLayout(layout); } while (cur.par() != send_cur.par());
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;
}
return endpar; return endpar;
} }