From: Stephan Witt <switt@lyx.org>
Date: Thu, 26 Jul 2012 22:34:17 +0000 (+0200)
Subject: Fix bug #8238: correct the forward argument of replace2string() in on_replacePB_click... 
X-Git-Tag: 2.1.0beta1~1625
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=44b327800666f30d2713c6c9e26f275aadfa4b9c;p=features.git

Fix bug #8238: correct the forward argument of replace2string() in on_replacePB_clicked().
---

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index e65e22346c..98eaace14a 100644
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -457,8 +457,13 @@ void SpellcheckerWidget::on_replacePB_clicked()
 		return;
 	docstring const textfield = qstring_to_ucs4(d->ui.wordED->text());
 	docstring const replacement = qstring_to_ucs4(d->ui.replaceCO->currentText());
-	docstring const datastring = replace2string(replacement, textfield,
-		true, true, false, false);
+	docstring const datastring = 
+		replace2string(replacement, textfield,
+			true,   // case sensitive
+			true,   // match word
+			false,  // all words
+			true,   // forward
+			false); // find next
 
 	LYXERR(Debug::GUI, "Replace (" << replacement << ")");
 	dispatch(FuncRequest(LFUN_WORD_REPLACE, datastring));
@@ -474,8 +479,13 @@ void SpellcheckerWidget::on_replaceAllPB_clicked()
 		return;
 	docstring const textfield = qstring_to_ucs4(d->ui.wordED->text());
 	docstring const replacement = qstring_to_ucs4(d->ui.replaceCO->currentText());
-	docstring const datastring = replace2string(replacement, textfield,
-		true, true, true, true);
+	docstring const datastring =
+		replace2string(replacement, textfield,
+			true,   // case sensitive
+			true,   // match word
+			true,   // all words
+			true,   // forward
+			false); // find next
 
 	LYXERR(Debug::GUI, "Replace all (" << replacement << ")");
 	dispatch(FuncRequest(LFUN_WORD_REPLACE, datastring));
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 40a4f575e3..8bea710821 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -783,7 +783,11 @@ void MenuDefinition::expandSpellingSuggestions(BufferView const * bv)
 					MenuItem w(MenuItem::Command, toqstr(suggestion),
 						FuncRequest(LFUN_WORD_REPLACE,
 							replace2string(suggestion, selection,
-								true, true, false, true, false)));
+								true,     // case sensitive
+								true,     // match word
+								false,    // all words
+								true,     // forward
+								false))); // find next
 					if (i < m)
 						add(w);
 					else