* layouttranslations.review - remove dupes

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 874b3411a51c4e9fb1d048a7d1b2a04c60ba86fa..9e7ddd31feaf3987bc393ec33b7fa572e48f2cd2 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -209,10 +209,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                if (tmpbuf->params().depth() > max_depth)
                        tmpbuf->params().depth(max_depth);
 
-               // Only set this from the 2nd on as the 2nd depends
-               // for maxDepth still on pit.
-               if (tmpbuf != insertion.begin())
-                       max_depth = tmpbuf->getMaxDepthAfter();
+               // Set max_depth for the next paragraph
+               max_depth = tmpbuf->getMaxDepthAfter();
 
                // Set the inset owner of this paragraph.
                tmpbuf->setInsetOwner(target_inset);
@@ -532,6 +530,8 @@ void putClipboard(ParagraphList const & paragraphs,
                OutputParams runparams(encodings.fromLyXName("utf8"));
                // We do not need to produce images, etc.
                runparams.dryrun = true;
+               // We are not interested in errors (bug 8866)
+               runparams.silent = true;
                buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource);
 
                theClipboard().put(lyx, oshtml.str(), plaintext);
@@ -1096,7 +1096,7 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
 
        // Then try TeX and HTML
        Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType};
-       string names[2] = {"html", "latex"};
+       string names[2] = {"html", "latexclipboard"};
        for (int i = 0; i < 2; ++i) {
                if (type != types[i] && type != Clipboard::AnyTextType)
                        continue;