From e00b11355d640c9ce2b279bc7ae7d33a8caebdf9 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 (cherry picked from commit 5dde4b1b3e69f132e2f27116cde377f80adb5ea3) --- src/CutAndPaste.cpp | 8 ++++++++ status.23x | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 43e6278b3e..9507b2b57f 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) { diff --git a/status.23x b/status.23x index dcee94718c..76a9e7633f 100644 --- a/status.23x +++ b/status.23x @@ -173,6 +173,9 @@ What's new - Fix suprious comma in book and thesis bib preview (bug 11272). +- Merge paragraphs when pasted into an inset that forbids multiple + paragraphs (bug 8281). + * INTERNALS -- 2.39.5