another fix

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index f1ee3e12c01df1b5743500898ec45f2f593917ec..e1db73ad69c62a4cf2eac92696e148135118a369 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -72,15 +72,9 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
        if (!lay.Read(lexrc, *this)) {
                // Resolve fonts
                lay.resfont = lay.font;
-#ifndef INHERIT_LANGUAGE
                lay.resfont.realize(defaultfont());
                lay.reslabelfont = lay.labelfont;
                lay.reslabelfont.realize(defaultfont());
-#else
-               lay.resfont.realize(defaultfont(), default_language);
-               lay.reslabelfont = lay.labelfont;
-               lay.reslabelfont.realize(defaultfont(), default_language);
-#endif
                return false; // no errors
        }
        lyxerr << "Error parsing style `" << lay.name() << "'" << endl;
@@ -266,12 +260,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        if (!defaultfont_.resolved()) {
                                lexrc.printError("Warning: defaultfont should "
                                                 "be fully instantiated!");
-#ifndef INHERIT_LANGUAGE
                                defaultfont_.realize(LyXFont(LyXFont::ALL_SANE));
-#else
-                               defaultfont_.realize(LyXFont(LyXFont::ALL_SANE),
-                                                    default_language);
-#endif
                        }
                        break;