X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=3692dcc873fdaef55fdf95232feee7beb3b49513;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=9e3a8ccbc2b7975c3ec52eb510021693e4e75af4;hpb=e26164c806e44e41b1e358f44f2548fa603f11af;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 9e3a8ccbc2..3692dcc873 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -196,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); @@ -377,8 +377,7 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, // This is invalid outside of ERT, so we need to change it // to the buffer language. if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) { - it->changeLanguage(buf.params(), latex_language, - buf.getLanguage()); + it->changeLanguage(buf.params(), latex_language, buf.language()); } it->setInsetOwner(0); }