From f2e38b021ade674e480916ec65b3fc7a013e6136 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Thu, 25 Nov 2010 10:25:29 +0000
Subject: [PATCH] LaTeXFeatures.cpp (useBabel, usePolyglossia): 	- thinko (bug
 #7074)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36477 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/LaTeXFeatures.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f694e53797..7b2778ceb2 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -285,22 +285,20 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 bool LaTeXFeatures::useBabel() const
 {
-	return (lyxrc.language_package_selection != LyXRC::LP_NONE)
-	        && !usePolyglossia()
-	        && ((bufferParams().language->lang() != lyxrc.default_language
+	if (usePolyglossia())
+		return false;
+	return lyxrc.language_package_selection != LyXRC::LP_NONE
+	        || (bufferParams().language->lang() != lyxrc.default_language
 	            && !bufferParams().language->babel().empty())
-	            || this->hasLanguages());
+	        || this->hasLanguages();
 }
 
 
 bool LaTeXFeatures::usePolyglossia() const
 {
-	return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+	return lyxrc.language_package_selection == LyXRC::LP_AUTO
 	        && isRequired("polyglossia")
 	        && isAvailable("polyglossia")
-	        && ((bufferParams().language->lang() != lyxrc.default_language
-	             && !bufferParams().language->polyglossia().empty())
-	            || this->hasLanguages())
 	        && this->hasPolyglossiaLanguages();
 }
 
-- 
2.39.2