If we are in a closeEvent, we don't want to close all buffers, because these may...

[lyx.git] / src / frontends / qt4 / GuiSpellchecker.cpp

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index aacac46dc9e6afa35fc4009a5b827bb680329ed8..c6a4adf20b79eb9a24c4323c0249978cb654b5f1 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -92,7 +92,7 @@ void GuiSpellchecker::on_closePB_clicked()
 }
 
 
-void GuiSpellchecker::on_suggestionsLW_itemChanged(QListWidgetItem * item)
+void GuiSpellchecker::on_suggestionsLW_itemClicked(QListWidgetItem * item)
 {
        if (d->ui.replaceCO->count() != 0)
                d->ui.replaceCO->setItemText(0, item->text());
@@ -163,6 +163,8 @@ void GuiSpellchecker::on_replacePB_clicked()
 
        LYXERR(Debug::GUI, "Replace (" << replacement << ")");
        BufferView * bv = const_cast<BufferView *>(bufferview());
+       if (!bv->cursor().inTexted())
+               return;
        cap::replaceSelectionWithString(bv->cursor(), replacement, true);
        bv->buffer().markDirty();
        // If we used an LFUN, we would not need that
@@ -176,10 +178,11 @@ void GuiSpellchecker::on_replacePB_clicked()
 void GuiSpellchecker::on_replaceAllPB_clicked()
 {
        docstring const data = replace2string(
-               qstring_to_ucs4(d->ui.wordED->text()),
                qstring_to_ucs4(d->ui.replaceCO->currentText()),
+               qstring_to_ucs4(d->ui.wordED->text()),
                true, true, true, true);
        dispatch(FuncRequest(LFUN_WORD_REPLACE, data));
+       check(); // continue spellchecking
 }
 
 
@@ -191,13 +194,13 @@ void GuiSpellchecker::updateSuggestions(docstring_list & words)
        lw->clear();
 
        if (words.empty()) {
-               on_suggestionsLW_itemChanged(new QListWidgetItem(suggestion));
+               on_suggestionsLW_itemClicked(new QListWidgetItem(suggestion));
                return;
        }
        for (size_t i = 0; i != words.size(); ++i)
                lw->addItem(toqstr(words[i]));
 
-       on_suggestionsLW_itemChanged(lw->item(0));
+       on_suggestionsLW_itemClicked(lw->item(0));
        lw->setCurrentRow(0);
 }