installer: further preparation

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 50e2f8f7a8aaffe7bcae861999d2eb60995ad09d..ce6164d4ad09b2dbb251100e40eda5419d9e5aef 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -530,6 +530,8 @@ void putClipboard(ParagraphList const & paragraphs,
                // XHTML format
                odocstringstream oshtml;
                OutputParams runparams(encodings.fromLyXName("utf8"));
+               // We do not need to produce images, etc.
+               runparams.dryrun = true;
                buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource);
 
                theClipboard().put(lyx, oshtml.str(), plaintext);
@@ -899,7 +901,8 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
        Paragraph par;
        BufferParams const & bp = cur.buffer()->params();
        par.setLayout(bp.documentClass().plainLayout());
-       par.insertInset(0, inset, Change(Change::UNCHANGED));
+       Font font(inherit_font, bp.language);
+       par.insertInset(0, inset, font, Change(Change::UNCHANGED));
        pars.push_back(par);
        theCuts.push(make_pair(pars, bp.documentClassPtr()));
 
@@ -1040,8 +1043,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
 
                PasteReturnValue prv =
                        pasteSelectionHelper(cur, parlist, docclass, 0, errorList);
-               if (prv.needupdate)
-                       cur.forceBufferUpdate();
+               cur.forceBufferUpdate();
                cur.clearSelection();
                text->setCursor(cur, prv.par, prv.pos);
        }