From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 14 Jul 2011 08:51:49 +0000 (+0000)
Subject: Language: Get rid of ignore_lang and latex_lang global variables and add a check... 
X-Git-Tag: 2.1.0beta1~2931
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fcb2cce53f566f8e349ded600ceedd40482e453c;p=lyx.git

Language: Get rid of ignore_lang and latex_lang global variables and add a check against multiple definitions.


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

diff --git a/src/Language.cpp b/src/Language.cpp
index 8e5f86fa83..85fb383993 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -22,6 +22,7 @@
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
 
@@ -31,11 +32,9 @@ using namespace lyx::support;
 namespace lyx {
 
 Languages languages;
-Language ignore_lang;
-Language latex_lang;
-Language const * default_language;
-Language const * ignore_language = &ignore_lang;
-Language const * latex_language = &latex_lang;
+Language const * ignore_language = 0;
+Language const * default_language = 0;
+Language const * latex_language = 0;
 Language const * reset_language = 0;
 
 
@@ -226,11 +225,17 @@ void Languages::read(FileName const & filename)
 		l.read(lex);
 		if (!lex)
 			break;
-		if (l.lang() == "latex")
-			latex_lang = l;
-		else if (l.lang() == "ignore")
-			ignore_lang = l;
-		else
+		if (l.lang() == "latex") {
+			// Check if latex language was not already defined.
+			LASSERT(latex_language == 0, continue);
+			static const Language latex_lang = l;
+			latex_language = &latex_lang;
+		} else if (l.lang() == "ignore") {
+			// Check if ignore language was not already defined.
+			LASSERT(ignore_language == 0, continue);
+			static const Language ignore_lang = l;
+			ignore_language = &ignore_lang;
+		} else
 			languagelist[l.lang()] = l;
 	}