X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView2.C;h=b58b1c3ca69174f352dac9b8b5d30db93e1f9121;hb=5bca2431091765b1552cbb5410b1f2c18bbcb9c1;hp=6af288a3ab11ee1cdadb3942c325425156011991;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 6af288a3ab..b58b1c3ca6 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -31,6 +31,8 @@
 #include "language.h"
 #include "gettext.h"
 #include "undo_funcs.h"
+#include "debug.h"
+#include "iterators.h"
 
 extern BufferList bufferlist;
 
@@ -264,7 +266,7 @@ void BufferView::copyEnvironment()
 		text->copyEnvironmentType();
 		// clear the selection, even if mark_set
 		toggleSelection();
-		text->clearSelection(this);
+		text->clearSelection();
 		update(text, BufferView::SELECT|BufferView::FITCUR);
 		owner()->message(_("Paragraph environment type copied"));
 	}
@@ -287,19 +289,19 @@ void BufferView::copy()
 		text->copySelection(this);
 		// clear the selection, even if mark_set
 		toggleSelection();
-		text->clearSelection(this);
+		text->clearSelection();
 		update(text, BufferView::SELECT|BufferView::FITCUR);
 		owner()->message(_("Copy"));
 	}
 }
 
 
-void BufferView::cut()
+void BufferView::cut(bool realcut)
 {
 	if (available()) {
 		hideCursor();
 		update(text, BufferView::SELECT|BufferView::FITCUR);
-		text->cutSelection(this);
+		text->cutSelection(this, true, realcut);
 		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		owner()->message(_("Cut"));
 	}
@@ -315,7 +317,7 @@ void BufferView::paste()
 	hideCursor();
 	// clear the selection
 	toggleSelection();
-	text->clearSelection(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 	
 	// paste
@@ -324,7 +326,7 @@ void BufferView::paste()
 	
 	// clear the selection 
 	toggleSelection();
-	text->clearSelection(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -345,8 +347,10 @@ void BufferView::selectLastWord()
 {
 	if (!available()) return;
    
+	LyXCursor cur = text->selection.cursor;
 	hideCursor();
 	beforeChange(text);
+	text->selection.cursor = cur;
 	text->selectSelectedWord(this);
 	toggleSelection(false);
 	update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -360,7 +364,7 @@ void BufferView::endOfSpellCheck()
 	hideCursor();
 	beforeChange(text);
 	text->selectSelectedWord(this);
-	text->clearSelection(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -406,19 +410,21 @@ bool BufferView::lockInset(UpdatableInset * inset)
 
 void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-	if (theLockingInset() && available()) {
+	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);
+			                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()
@@ -489,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;
@@ -509,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;