From: John Levon <levon@movementarian.org>
Date: Fri, 6 Jun 2003 14:47:43 +0000 (+0000)
Subject: lang apply fix
X-Git-Tag: 1.6.10~16671
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=387d1c6416a2a7f6214568314d7eab2639dbfa8a;p=features.git

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 2ac32e3bde..a9572740e1 100644
--- 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 58b6877adf..e30f5eb216 100644
--- 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..."));