Don't allow newline characters in preference (#5840).

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

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 559ce29dd62cf58684b63ae593a9ff10b29d0308..5e7305e75a9897ffe7409753e6d20b9d33e4290a 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -60,7 +60,7 @@ namespace frontend {
 struct SpellcheckerWidget::Private
 {
        Private(SpellcheckerWidget * parent, DockView * dv)
-               : p(parent), dv_(dv), start_(true), incheck_(false) {}
+               : p(parent), dv_(dv), incheck_(false), wrap_around_(false) {}
        /// update from controller
        void updateSuggestions(docstring_list & words);
        /// move to next position after current word
@@ -79,6 +79,8 @@ struct SpellcheckerWidget::Private
                return false;
        }
        void canCheck() { incheck_ = false; }
+       /// check for wrap around of current position
+       bool isWrapAround(DocIterator cursor) const;
        ///
        Ui::SpellcheckerUi ui;
        ///
@@ -90,9 +92,11 @@ struct SpellcheckerWidget::Private
        /// current word being checked and lang code
        WordLangTuple word_;
        ///
-       bool start_;
+       DocIterator start_;
        ///
        bool incheck_;
+       ///
+       bool wrap_around_;
 };
 
 
@@ -175,15 +179,8 @@ void SpellcheckerWidget::updateView()
 {
        BufferView * bv = d->gv_->documentBufferView();
        setEnabled(bv != 0);
-       if (bv && hasFocus() && d->start_) {
-               d->start_ = false;
-
-               BufferView * bv = d->gv_->documentBufferView();
-               std::set<Language const *> languages = 
-               bv->buffer().masterBuffer()->getLanguages();
-               if (!languages.empty())
-                       d->setLanguage(*languages.begin());
-               
+       if (bv && hasFocus() && d->start_.empty()) {
+               d->start_ = bv->cursor();
                d->check();
        }
 }
@@ -191,17 +188,23 @@ void SpellcheckerWidget::updateView()
 
 bool SpellcheckerWidget::Private::continueFromBeginning()
 {
-               QMessageBox::StandardButton const answer = QMessageBox::question(p,
-                       qt_("Spell Checker"),
-                       qt_("We reached the end of the document, would you like to "
-                               "continue from the beginning?"),
-                       QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-               if (answer == QMessageBox::No) {
-                       dv_->hide();
-                       return false;
-               }
-               dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
-               return true;
+       QMessageBox::StandardButton const answer = QMessageBox::question(p,
+               qt_("Spell Checker"),
+               qt_("We reached the end of the document, would you like to "
+                       "continue from the beginning?"),
+               QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+       if (answer == QMessageBox::No) {
+               dv_->hide();
+               return false;
+       }
+       dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
+       wrap_around_ = true;
+       return true;
+}
+
+bool SpellcheckerWidget::Private::isWrapAround(DocIterator cursor) const
+{
+       return wrap_around_ && start_.buffer() == cursor.buffer() && start_ < cursor;
 }
 
 
@@ -220,6 +223,9 @@ void SpellcheckerWidget::Private::forward()
                //FIXME we must be at the end of a cell
                dispatch(FuncRequest(LFUN_CHAR_FORWARD));
        }
+       if (isWrapAround(bv->cursor())) {
+               dv_->hide();
+       }
 }
 
 
@@ -237,7 +243,16 @@ void SpellcheckerWidget::on_languageCO_activated(int index)
 
 bool SpellcheckerWidget::initialiseParams(std::string const &)
 {
-       d->start_ = true;
+       BufferView * bv = d->gv_->documentBufferView();
+       if (bv == 0)
+               return false;
+       std::set<Language const *> languages = 
+       bv->buffer().masterBuffer()->getLanguages();
+       if (!languages.empty())
+               d->setLanguage(*languages.begin());
+       d->start_ = DocIterator();
+       d->wrap_around_ = false;
+       d->incheck_ = false;
        return true;
 }
 
@@ -380,11 +395,20 @@ void SpellcheckerWidget::Private::check()
 
        // end of document
        if (from == doc_iterator_end(&bv->buffer())) {
+               if (wrap_around_ || start_ == doc_iterator_begin(&bv->buffer())) {
+                       dv_->hide();
+                       return;
+               }
                if (continueFromBeginning())
                        check();
                return;
        }
 
+       if (isWrapAround(from)) {
+               dv_->hide();
+               return;
+       }
+
        word_ = word_lang;
 
        // set suggestions