lang apply fix

[lyx.git] / src / frontends / controllers / ControlDocument.C

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index 58b6877adf0e15d97617e63721ce37c039da633f..e30f5eb2160e1956a98bf9ad94d3ed92e992ad8a 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -63,10 +63,14 @@ void ControlDocument::apply()
        if (!bufferIsAvailable())
                return;
 
-       classApply();
-
        view().apply();
+
+       // this must come first so that a language change
+       // is correctly noticed
        setLanguage();
+
+       classApply();
+
        buffer()->params = *bp_;
 
        lv_.view()->redoCurrentBuffer();
@@ -114,7 +118,6 @@ void ControlDocument::classApply()
                return;
 
        // successfully loaded
-       view().apply();
        buffer()->params = *bp_;
 
        lv_.message(_("Converting document to new document class..."));