lang apply fix

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

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 2ac32e3bde08f27dae00ae8ae4957de0d7bae619..a9572740e1479a3f353942e0ab5299cd88081548 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-06  John Levon  <levon@movementarian.org>
+
+       * ControlDocument.C: make sure a language change
+       always gets propogated
+
 2003-06-03  Angus Leeming  <leeming@lyx.org>
 
        * ControlExternal.[Ch]: remove viewExternal and updateExternal.

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..."));