From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Mon, 9 May 2011 01:24:16 +0000 (+0000)
Subject: Still addressing #6560: instead of cloning the BufferParams, which might cause
X-Git-Tag: 2.0.1~342
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a00e9f4061d8195bd3e07b06b076308e807bd81e;p=features.git

Still addressing #6560: instead of cloning the BufferParams, which might cause
a number of unforeseen issues (like the inheritance of the default master, as
pointed out in http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg168225.html),
now we simply set the language into the search & replace buffers.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38648 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 488508555d..c9803e1be9 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2085,6 +2085,18 @@ void BufferParams::readLocalLayout(Lexer & lex)
 }
 
 
+bool BufferParams::setLanguage(string const & lang)
+{
+	Language const *new_language = languages.getLanguage(lang);
+	if (!new_language) {
+		// Language lang was not found
+		return false;
+	}
+	language = new_language;
+	return true;
+}
+
+
 void BufferParams::readLanguage(Lexer & lex)
 {
 	if (!lex.next()) return;
@@ -2092,8 +2104,7 @@ void BufferParams::readLanguage(Lexer & lex)
 	string const tmptok = lex.getString();
 
 	// check if tmptok is part of tex_babel in tex-defs.h
-	language = languages.getLanguage(tmptok);
-	if (!language) {
+	if (!setLanguage(tmptok)) {
 		// Language tmptok was not found
 		language = default_language;
 		lyxerr << "Warning: Setting language `"
diff --git a/src/BufferParams.h b/src/BufferParams.h
index ee2b22a248..96747d51f3 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -414,6 +414,10 @@ public:
 	/// use refstyle? or prettyref?
 	bool use_refstyle;
 
+	/// Return true if language could be set to lang,
+	/// otherwise return false and do not change language
+	bool setLanguage(std::string const & lang);
+
 private:
 	///
 	void readPreamble(Lexer &);
diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 104ec0ccf0..7934797684 100644
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -45,20 +45,6 @@ namespace lyx {
 namespace frontend {
 
 
-/// Apply to buf the parameters supplied through bp
-static void ApplyParams(Buffer &buf, BufferParams const & bp) {
-	ostringstream ss;
-	ss << "\\begin_header\n";
-	bp.writeFile(ss);
-	ss << "\\end_header\n";
-	istringstream iss(ss.str());
-	Lexer lex;
-	lex.setStream(iss);
-	int unknown_tokens = buf.readHeader(lex);
-	LASSERT(unknown_tokens == 0, /* */);
-}
-
-
 FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
 	: QTabWidget(&view), view_(view)
 {
@@ -489,18 +475,17 @@ void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */)
 	if (bv) {
 		Buffer & doc_buf = bv->buffer();
 		BufferParams & doc_bp = doc_buf.params();
+		string const & lang = doc_bp.language->lang();
 		Buffer & find_buf = find_work_area_->bufferView().buffer();
 		LYXERR(Debug::FIND, "Applying document params to find buffer");
-		ApplyParams(find_buf, doc_bp);
+		find_buf.params().setLanguage(lang);
 		Buffer & replace_buf = replace_work_area_->bufferView().buffer();
 		LYXERR(Debug::FIND, "Applying document params to replace buffer");
-		ApplyParams(replace_buf, doc_bp);
+		replace_buf.params().setLanguage(lang);
 
-		string lang = doc_bp.language->lang();
 		LYXERR(Debug::FIND, "Setting current editing language to " << lang << endl);
-		FuncRequest cmd(LFUN_LANGUAGE, lang);
-		find_buf.text().dispatch(find_work_area_->bufferView().cursor(), cmd);
-		replace_buf.text().dispatch(replace_work_area_->bufferView().cursor(), cmd);
+		find_work_area_->bufferView().cursor().current_font.setLanguage(doc_bp.language);
+		replace_work_area_->bufferView().cursor().current_font.setLanguage(doc_bp.language);
 	}
 
 	find_work_area_->installEventFilter(this);