Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index c130c1d51fe963b65a9be75103386315ccb4f808..6f84e5f5b0efcd6db583435569abd78e6adae09d 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -32,6 +32,7 @@
 #include "gettext.h"
 #include "undo_funcs.h"
 #include "debug.h"
+#include "iterators.h"
 
 extern BufferList bufferlist;
 
@@ -230,7 +231,7 @@ void BufferView::menuUndo()
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
                if (!textUndo(this))
-                       owner()->message(_("No forther undo information"));
+                       owner()->message(_("No further undo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
@@ -338,7 +339,7 @@ string const BufferView::nextWord(float & value)
                return string();
        }
 
-       return text->selectNextWord(this, value);
+       return text->selectNextWordToSpellcheck(this, value);
 }
 
   
@@ -411,17 +412,19 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (available() && theLockingInset()) {
                LyXCursor cursor = text->cursor;
+               Inset * locking_inset = theLockingInset()->getLockingInset();
+
                if ((cursor.pos() - 1 >= 0) &&
                    (cursor.par()->getChar(cursor.pos() - 1) ==
                     Paragraph::META_INSET) &&
                    (cursor.par()->getInset(cursor.pos() - 1) ==
-                    theLockingInset()->getLockingInset()))
+                    locking_inset))
                        text->setCursor(this, cursor,
                                        cursor.par(), cursor.pos() - 1);
                LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
                LyXText * txt = getLyXText();
-               if (theLockingInset()->getLockingInset()->lyxCode() ==
-                   Inset::TEXT_CODE &&
+               if (locking_inset->isTextInset() &&
+                   locking_inset->lyxCode() != Inset::ERT_CODE &&
                    (txt->real_current_font.language() !=
                     buffer()->params.language
                     || txt->real_current_font.isVisibleRightToLeft()
@@ -492,18 +495,20 @@ bool BufferView::ChangeInsets(Inset::Code code,
                              string const & from, string const & to)
 {
        bool flag = false;
-       Paragraph * par = buffer()->paragraph;
        LyXCursor cursor = text->cursor;
        LyXCursor tmpcursor = cursor;
        cursor.par(tmpcursor.par());
        cursor.pos(tmpcursor.pos());
 
-       while (par) {
+       ParIterator end = buffer()->par_iterator_end();
+       for (ParIterator it = buffer()->par_iterator_begin();
+            it != end; ++it) {
+               Paragraph * par = *it;
                bool flag2 = false;
-               for (Paragraph::inset_iterator it = par->inset_iterator_begin();
-                    it != par->inset_iterator_end(); ++it) {
-                       if ((*it)->lyxCode() == code) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(*it);
+               for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+                    it2 != par->inset_iterator_end(); ++it2) {
+                       if ((*it2)->lyxCode() == code) {
+                               InsetCommand * inset = static_cast<InsetCommand *>(*it2);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);
                                        flag2 = true;
@@ -512,14 +517,16 @@ bool BufferView::ChangeInsets(Inset::Code code,
                }
                if (flag2) {
                        flag = true;
-                       // this is possible now, since SetCursor takes
-                       // care about footnotes
-                       text->setCursorIntern(this, par, 0);
-                       text->redoParagraphs(this, text->cursor,
-                                            text->cursor.par()->next());
-                       text->fullRebreak(this);
+#warning Fix me
+                       // The test it.size()==1 was needed to prevent crashes.
+                       // How to set the cursor corretly when it.size()>1 ??
+                       if (it.size() == 1) {
+                               text->setCursorIntern(this, par, 0);
+                               text->redoParagraphs(this, text->cursor,
+                                                    text->cursor.par()->next());
+                               text->fullRebreak(this);
+                       }
                }
-               par = par->next();
        }
        text->setCursorIntern(this, cursor.par(), cursor.pos());
        return flag;