anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unneeded args from realizeFont

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6818 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-04-15 18:34:43 +00:00
parent 27bd711d61
commit 9de8beeae6
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -1,3 +1,15 @@
2003-04-15 Lars Gullik Bjønnes <larsbj@gullik.net>
* text2.C (getFont): adjust
(getLayoutFont): adjust
(getLabelFont): adjust
* paragraph.C (getFont): adjust
(getLabelFont): adjust
(getLayoutFont): adjust
* paragraph_funcs.[Ch] (realizeFont): remove unneeded arguments.
2003-04-15 John Levon <levon@movementarian.org>
From Angus Leeming

6
src/paragraph.C
View File

@ -453,7 +453,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
tmpfont.realize(layoutfont);
tmpfont.realize(outerfont);
return realizeFont(tmpfont, bparams, 0, false);
return realizeFont(tmpfont, bparams);
}
@ -466,7 +466,7 @@ LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
return realizeFont(tmpfont, bparams, 0, false);
return realizeFont(tmpfont, bparams);
}
@ -479,7 +479,7 @@ LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
return realizeFont(tmpfont, bparams, 0, false);
return realizeFont(tmpfont, bparams);
}

11
src/paragraph_funcs.C
View File

@ -1049,19 +1049,10 @@ LyXFont const outerFont(ParagraphList::iterator pit)
LyXFont const realizeFont(LyXFont const & font,
BufferParams const & params,
ParagraphList::iterator pit,
bool outerhook)
BufferParams const & params)
{
LyXTextClass const & tclass = params.getLyXTextClass();
LyXFont tmpfont(font);
if (outerhook) {
LyXFont of = outerFont(pit);
tmpfont.realize(of);
}
tmpfont.realize(tclass.defaultfont());
return tmpfont;
}

4
src/paragraph_funcs.h
View File

@ -67,9 +67,7 @@ void latexParagraphs(Buffer const * buf,
int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
LyXFont const realizeFont(LyXFont const & font,
BufferParams const & params,
ParagraphList::iterator pit,
bool outerhook = true);
BufferParams const & params);
LyXFont const outerFont(ParagraphList::iterator pit);

6
src/text2.C
View File

@ -152,7 +152,7 @@ LyXFont const LyXText::getFont(Buffer const * buf, ParagraphList::iterator pit,
// Realize with the fonts of lesser depth.
tmpfont.realize(outerFont(pit));
return realizeFont(tmpfont, buf->params, pit, false);
return realizeFont(tmpfont, buf->params);
}
@ -169,7 +169,7 @@ LyXFont const LyXText::getLayoutFont(Buffer const * buf,
// Realize with the fonts of lesser depth.
font.realize(outerFont(pit));
return realizeFont(font, buf->params, pit, false);
return realizeFont(font, buf->params);
}
@ -186,7 +186,7 @@ LyXFont const LyXText::getLabelFont(Buffer const * buf,
// Realize with the fonts of lesser depth.
font.realize(outerFont(pit));
return realizeFont(layout->labelfont, buf->params, pit, false);
return realizeFont(layout->labelfont, buf->params);
}