X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=5f1410726b5215f0ba6bda8e2ba46a53b4e1cfb3;hb=03ec50ac4d06ef2b000d87a175d7a149c9abb2bf;hp=87e0803b78c1572c0f05f3b6417324788e7855b3;hpb=7d888cc5e016c8f0621348630969539fd4d4ddad;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 87e0803b78..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(); @@ -122,6 +126,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, 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); @@ -988,7 +993,7 @@ void selClearOrDel(Cursor & cur) if (lyxrc.auto_region_delete) selDel(cur); else - cur.selection() = false; + cur.setSelection(false); }