From 5dde4b1b3e69f132e2f27116cde377f80adb5ea3 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 11 May 2018 13:17:39 +0200 Subject: [PATCH] Merge paragraphs when pasted into an inset that forbids multipars Fixes: #8281 --- src/CutAndPaste.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 9088f6b6cc..329d3f9248 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -142,6 +142,14 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // Now remove all out of the pars which is NOT allowed in the // new environment and set also another font if that is required. + // Merge paragraphs that are to be pasted into a text inset + // that does not allow multiple pars. + InsetText * inset_text = target_inset->asInsetText(); + if (inset_text && !inset_text->allowMultiPar()) { + while (insertion.size() > 1) + mergeParagraph(buffer.params(), insertion, 0); + } + // Convert newline to paragraph break in ParbreakIsNewline if (target_inset->getLayout().parbreakIsNewline() || pars[pit].layout().parbreak_is_newline) { -- 2.39.2