SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index c6c70209d9735149c81893b9706f89542b6ef36f..80409eafd704342f41d94268127d14f1f1ecbbf8 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1378,18 +1378,14 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
 {
        BOOST_ASSERT(pos >= 0);
 
-       Layout_ptr const & lout = layout();
+       Font font = getFontSettings(bparams, pos);
 
        pos_type const body_pos = beginOfBody();
-
-       Font layoutfont;
        if (pos < body_pos)
-               layoutfont = lout->labelfont;
+               font.realize(layout_->labelfont);
        else
-               layoutfont = lout->font;
+               font.realize(layout_->font);
 
-       Font font = getFontSettings(bparams, pos);
-       font.realize(layoutfont);
        font.realize(outerfont);
        font.realize(bparams.getFont());