remove unneeded args from realizeFont

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 1dae5ac70354fd58828b38267c3b7ef73bf9b82d..92ade61b865b1ff84d848c388d46039239fcd04d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/paragraph.C b/src/paragraph.C
index 6477b1ad036dc18df04ceb0588da32f888ff454a..dd71347f4968979fe45df599b6677243c4719fe9 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -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);
 }
 
 

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index cb3f557cd5d3e9675fb07b56667650024ebb738e..b19226190f5c57812c629852206d262295601f56 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -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;
 }

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index ca8c312b10395fef7028bdb98cd4717fb825e9e4..4e42e4985cecd01177b0d9c62e6927e39c0ca700 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -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);
 

diff --git a/src/text2.C b/src/text2.C
index f31faa8f19331c723d81a138234fe71ae3109415..b3c34c090877fec72ed9bd7bc6fe7a195eecbf0d 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -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);
 }