- LyXParagraph * par = buffer()->paragraph;
-
- LyXCursor tmpcursor = text->cursor;
- LyXCursor cursor;
-
- bool a = false;
- while (par) {
- // this has to be done before the delete
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- text->SetCursor(this, cursor, par, 0);
- if (par->AutoDeleteInsets()){
- a = true;
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
- text->RedoParagraphs(this, cursor,
- cursor.par()->Next());
- text->FullRebreak(this);
+ // keep track of which pos and par the cursor was on
+ Paragraph * cursor_par = text->cursor.par();
+ Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0;
+ Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0;
+ pos_type cursor_pos = text->cursor.pos();
+
+ bool found = false;
+
+ // Trap the deletion of the paragraph the cursor is in.
+ // Iterate until we find a paragraph that won't be immediately deleted.
+ // In reality this should mean we only execute the body of the while
+ // loop once at most. However for safety we iterate rather than just
+ // make this an if () conditional.
+ while ((cursor_par_prev || cursor_par_next)
+ && text->setCursor(this,
+ cursor_par_prev ? cursor_par_prev : cursor_par_next,
+ 0)) {
+ // We just removed cursor_par so have to fix the "cursor"
+ if (cursor_par_prev) {
+ // '.' = cursor_par
+ // a -> a.
+ // .
+ cursor_par = cursor_par_prev;
+ cursor_pos = cursor_par->size();
+ } else {
+ // . -> .a
+ // a
+ cursor_par = cursor_par_next;
+ cursor_pos = 0;
+ }
+ cursor_par_prev = cursor_par->previous();
+ cursor_par_next = cursor_par->next();
+ }
+
+ // Iterate through the paragraphs removing autoDelete insets as we go.
+ // If the paragraph ends up empty after all the autoDelete insets are
+ // removed that paragraph will be removed by the next setCursor() call.
+ ParIterator it = buffer()->par_iterator_begin();
+ ParIterator end = buffer()->par_iterator_end();
+ for (; it != end; ++it) {
+ Paragraph * par = *it;
+ Paragraph * par_prev = par ? par->previous() : 0;
+ bool removed = false;
+
+ if (text->setCursor(this, par, 0)
+ && cursor_par == par_prev) {
+ // The previous setCursor line was deleted and that
+ // was the cursor_par line. This can only happen if an
+ // error box was the sole item on cursor_par.
+ // It is possible for cursor_par_prev to be stray if
+ // the line it pointed to only had a error box on it
+ // so we have to set it to a known correct value.
+ // This is often the same value it already had.
+ cursor_par_prev = par->previous();
+ if (cursor_par_prev) {
+ // '|' = par, '.' = cursor_par, 'E' = error box
+ // First step below may occur before while{}
+ // a |a a a a.
+ // E -> .E -> |.E -> . -> |b
+ // . b b |b
+ // b
+ cursor_par = cursor_par_prev;
+ cursor_pos = cursor_par_prev->size();
+ cursor_par_prev = cursor_par->previous();
+ // cursor_par_next remains the same
+ } else if (cursor_par_next) {
+ // First step below may occur before while{}
+ // .
+ // E -> |.E -> |. -> . -> .|a
+ // a a a |a
+ cursor_par = cursor_par_next;
+ cursor_pos = 0;
+ // cursor_par_prev remains unset
+ cursor_par_next = cursor_par->next();
+ } else {
+ // I can't find a way to trigger this
+ // so it should be unreachable code
+ // unless the buffer is corrupted.
+ lyxerr << "BufferView::removeAutoInsets() is bad\n";