X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=5f1410726b5215f0ba6bda8e2ba46a53b4e1cfb3;hb=03ec50ac4d06ef2b000d87a175d7a149c9abb2bf;hp=6652b2ef5b54548aa1af85426e010dba4ab58cc9;hpb=227ae7c2c740c1618d3941b2b3668ed9041ee619;p=lyx.git

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 6652b2ef5b..5f1410726b 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -97,6 +97,10 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 	pit_type pit = cur.pit();
 	pos_type pos = cur.pos();
 	InsetText * target_inset = cur.inset().asInsetText();
+	if (!target_inset) {
+		InsetTabular * it = cur.inset().asInsetTabular();
+		target_inset = it? it->cell(cur.idx())->asInsetText() : 0;
+	}
 	LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit));
 	ParagraphList & pars = target_inset->paragraphs();
 
@@ -115,14 +119,14 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
 	// Convert newline to paragraph break in ERT inset.
 	// This should not be here!
-	Inset * inset = pars[pit].inInset();
-	if (inset && (inset->lyxCode() == ERT_CODE ||
-			inset->lyxCode() == LISTINGS_CODE)) {
+	InsetCode const code = target_inset->lyxCode();
+	if (code == ERT_CODE || code == LISTINGS_CODE) {
 		for (size_t i = 0; i != insertion.size(); ++i) {
 			for (pos_type j = 0; j != insertion[i].size(); ++j) {
 				if (insertion[i].isNewline(j)) {
 					// do not track deletion of newline
 					insertion[i].eraseChar(j, false);
+					insertion[i].setInsetOwner(target_inset);
 					breakParagraphConservative(
 							buffer.params(),
 							insertion, i, j);
@@ -196,7 +200,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 		for (pos_type i = 0; i < tmpbuf->size(); ++i) {
 			// do not track deletion of invalid insets
 			if (Inset * inset = tmpbuf->getInset(i))
-				if (target_inset->insetAllowed(inset->lyxCode()))
+				if (!target_inset->insetAllowed(inset->lyxCode()))
 					tmpbuf->eraseChar(i--, false);
 		}
 
@@ -989,7 +993,7 @@ void selClearOrDel(Cursor & cur)
 	if (lyxrc.auto_region_delete)
 		selDel(cur);
 	else
-		cur.selection() = false;
+		cur.setSelection(false);
 }