X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=3692dcc873fdaef55fdf95232feee7beb3b49513;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=20fafc2a2565d4c5b2d35710dd164c74a93ef1b8;hpb=978f65391e03cf36710527145c6c99d10474a1cd;p=lyx.git

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 20fafc2a25..3692dcc873 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -19,12 +19,14 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Changes.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "gettext.h"
 #include "InsetIterator.h"
+#include "InsetList.h"
 #include "Language.h"
 #include "lfuns.h"
 #include "LyXFunc.h"
@@ -44,6 +46,7 @@
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 
+#include "support/limited_stack.h"
 #include "support/lstrings.h"
 
 #include "frontends/Clipboard.h"
@@ -51,6 +54,7 @@
 
 #include <boost/current_function.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/next_prior.hpp>
 
 #include <string>
 
@@ -129,8 +133,8 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 	// Convert newline to paragraph break in ERT inset.
 	// This should not be here!
 	if (pars[pit].inInset() &&
-	    (pars[pit].inInset()->lyxCode() == Inset::ERT_CODE ||
-		pars[pit].inInset()->lyxCode() == Inset::LISTINGS_CODE)) {
+	    (pars[pit].inInset()->lyxCode() == ERT_CODE ||
+		pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
 		for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
 			for (pos_type j = 0; j < insertion[i].size(); ++j) {
 				if (insertion[i].isNewline(j)) {
@@ -192,7 +196,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 		// Set the inset owner of this paragraph.
 		tmpbuf->setInsetOwner(pars[pit].inInset());
 		for (pos_type i = 0; i < tmpbuf->size(); ++i) {
-			if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
+			if (tmpbuf->isInset(i) &&
 			    !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
 				// do not track deletion of invalid insets
 				tmpbuf->eraseChar(i--, false);
@@ -217,12 +221,12 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 	ParIterator fend = par_iterator_end(in);
 
 	for (; fpit != fend; ++fpit) {
-		InsetList::const_iterator lit = fpit->insetlist.begin();
-		InsetList::const_iterator eit = fpit->insetlist.end();
+		InsetList::const_iterator lit = fpit->insetList().begin();
+		InsetList::const_iterator eit = fpit->insetList().end();
 
 		for (; lit != eit; ++lit) {
 			switch (lit->inset->lyxCode()) {
-			case Inset::TABULAR_CODE: {
+			case TABULAR_CODE: {
 				InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
 				it->buffer(&buffer);
 				break;
@@ -372,9 +376,8 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
 		// ERT paragraphs have the Language latex_language.
 		// This is invalid outside of ERT, so we need to change it
 		// to the buffer language.
-		if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
-			it->changeLanguage(buf.params(), latex_language,
-					   buf.getLanguage());
+		if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) {
+			it->changeLanguage(buf.params(), latex_language, buf.language());
 		}
 		it->setInsetOwner(0);
 	}
@@ -441,7 +444,7 @@ void switchBetweenClasses(TextClassPtr const & c1,
 	// character styles
 	InsetIterator const i_end = inset_iterator_end(in);
 	for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
-		if (it->lyxCode() == Inset::FLEX_CODE) {
+		if (it->lyxCode() == FLEX_CODE) {
 			InsetFlex & inset =
 				static_cast<InsetFlex &>(*it);
 			string const name = inset.params().name;
@@ -517,7 +520,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 		saveSelection(cur);
 
 		// make sure that the depth behind the selection are restored, too
-		recordUndoSelection(cur);
+		cur.recordUndoSelection();
 		pit_type begpit = cur.selBegin().pit();
 		pit_type endpit = cur.selEnd().pit();
 
@@ -565,11 +568,11 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 		if (cur.selBegin().idx() != cur.selEnd().idx()) {
 			// The current selection spans more than one cell.
 			// Record all cells
-			recordUndoInset(cur);
+			cur.recordUndoInset();
 		} else {
 			// Record only the current cell to avoid a jumping
 			// cursor after undo
-			recordUndo(cur);
+			cur.recordUndo();
 		}
 		if (realcut)
 			copySelection(cur);
@@ -732,7 +735,7 @@ void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index)
 	if (!checkPastePossible(sel_index))
 		return;
 
-	recordUndo(cur);
+	cur.recordUndo();
 	pasteParagraphList(cur, theCuts[sel_index].first,
 			   theCuts[sel_index].second, errorList);
 	cur.setSelection();
@@ -756,7 +759,7 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 			Buffer buffer("", false);
 			buffer.setUnnamed(true);
 			if (buffer.readString(lyx)) {
-				recordUndo(cur);
+				cur.recordUndo();
 				pasteParagraphList(cur, buffer.paragraphs(),
 					buffer.params().getTextClassPtr(), errorList);
 				cur.setSelection();
@@ -769,7 +772,7 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 	docstring const text = theClipboard().getAsText();
 	if (text.empty())
 		return;
-	recordUndo(cur);
+	cur.recordUndo();
 	if (asParagraphs)
 		cur.text()->insertStringAsParagraphs(cur, text);
 	else
@@ -781,7 +784,7 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
 {
 	if (selectionBuffer.empty())
 		return;
-	recordUndo(cur);
+	cur.recordUndo();
 	pasteParagraphList(cur, selectionBuffer[0].first,
 			   selectionBuffer[0].second, errorList);
 }
@@ -789,7 +792,7 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
 
 void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards)
 {
-	recordUndo(cur);
+	cur.recordUndo();
 	DocIterator selbeg = cur.selectionBegin();
 
 	// Get font setting before we cut