- if (old_cursor.par() != cursor.par()) {
- if ((old_cursor.par()->size() == 0
- || (old_cursor.par()->size() == 1
- && old_cursor.par()->isLineSeparator(0)))) {
- // ok, we will delete anything
-
- // make sure that you do not delete any environments
- status = LyXText::NEED_MORE_REFRESH;
- deleted = true;
-
- if (old_cursor.row()->previous()) {
- refresh_row = old_cursor.row()->previous();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
- Paragraph * endpar = old_cursor.par()->next();
- if (endpar && endpar->getDepth()) {
- while (endpar && endpar->getDepth()) {
- endpar = endpar->next();
- }
- }
- setUndo(bview->buffer(), Undo::DELETE,
- old_cursor.par()->previous(),
- endpar);
- cursor = tmpcursor;
-
- // delete old row
- removeRow(old_cursor.row());
- if (ownerParagraph() == old_cursor.par()) {
- ownerParagraph(ownerParagraph()->next());
- }
- // delete old par
- delete old_cursor.par();
-
- /* Breakagain the next par. Needed
- * because of the parindent that
- * can occur or dissappear. The
- * next row can change its height,
- * if there is another layout before */
- if (refresh_row->next()) {
- breakAgain(bview, refresh_row->next());
- updateCounters(bview, refresh_row);
- }
- setHeightOfRow(bview, refresh_row);
- } else {
- refresh_row = old_cursor.row()->next();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline();
-
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
- Paragraph * endpar = old_cursor.par()->next();
- if (endpar && endpar->getDepth()) {
- while (endpar && endpar->getDepth()) {
- endpar = endpar->next();
- }
- }
- setUndo(bview->buffer(), Undo::DELETE,
- old_cursor.par()->previous(),
- endpar);
- cursor = tmpcursor;
-
- // delete old row
- removeRow(old_cursor.row());
- // delete old par
- if (ownerParagraph() == old_cursor.par()) {
- ownerParagraph(ownerParagraph()->next());
- }
-
- delete old_cursor.par();
-
- /* Breakagain the next par. Needed
- because of the parindent that can
- occur or dissappear.
- The next row can change its height,
- if there is another layout before
- */
- if (refresh_row) {
- breakAgain(bview, refresh_row);
- updateCounters(bview, refresh_row->previous());
- }
- }
-
- // correct cursor y
-
- setCursorIntern(bview, cursor.par(), cursor.pos());
-
- if (selection.cursor.par() == old_cursor.par()
- && selection.cursor.pos() == selection.cursor.pos()) {
- // correct selection
- selection.cursor = cursor;
- }
- }
- if (!deleted) {
- if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) {
- redoParagraphs(bview, old_cursor, old_cursor.par()->next());
- // correct cursor y
- setCursorIntern(bview, cursor.par(), cursor.pos());
- selection.cursor = cursor;
- }
+#ifdef WITH_WARNINGS
+#warning This will not work anymore when we have multiple views of the same buffer
+// In this case, we will have to correct also the cursors held by
+// other bufferviews. It will probably be easier to do that in a more
+// automated way in LyXCursor code. (JMarc 26/09/2001)
+#endif
+ // correct all cursors held by the LyXText
+ fixCursorAfterDelete(bview, cursor, old_cursor);
+ fixCursorAfterDelete(bview, selection.cursor,
+ old_cursor);
+ fixCursorAfterDelete(bview, selection.start,
+ old_cursor);
+ fixCursorAfterDelete(bview, selection.end, old_cursor);
+ fixCursorAfterDelete(bview, last_sel_cursor,
+ old_cursor);
+ fixCursorAfterDelete(bview, toggle_cursor, old_cursor);
+ fixCursorAfterDelete(bview, toggle_end_cursor,
+ old_cursor);
+ return false;