another fix

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index abe2ece5b771918520f64a84ac6b7619c2345805..42ec28da89bfc29a2794968895aa9ea4b034bfda 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -141,7 +141,7 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
        // Update the insets
        owner_->insetlist.increasePosAfterPos(pos);
-       
+
        owner_->setFont(pos, font);
 }
 
@@ -158,7 +158,7 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
        // Add a new entry in the insetlist.
        owner_->insetlist.insert(inset, pos);
        inset->parOwner(owner_);
-       
+
        if (inset_owner)
                inset->setOwner(inset_owner);
 }
@@ -591,9 +591,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                Language const * language = fcit->font().language();
                if (language->babel() != doc_language->babel() &&
                    language != ignore_language &&
-#ifdef INHERIT_LANGUAGE
-                   language != inherit_language &&
-#endif
                    language != latex_language)
                {
                        features.useLanguage(language);
@@ -656,19 +653,11 @@ LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
        while (par && par->getDepth() && !tmpfont.resolved()) {
                par = par->outerHook();
                if (par) {
-                       tmpfont.realize(par->layout()->font
-#ifdef INHERIT_LANGUAGE
-                                       , bparams.language
-#endif
-                                       );
+                       tmpfont.realize(par->layout()->font);
                        par_depth = par->getDepth();
                }
        }
 
-       tmpfont.realize(tclass.defaultfont()
-#ifdef INHERIT_LANGUAGE
-               , bparams.language
-#endif
-               );
+       tmpfont.realize(tclass.defaultfont());
        return tmpfont;
 }