anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge paragraphs when pasted into an inset that forbids multipars

Browse Source 
Fixes: #8281
(cherry picked from commit 5dde4b1b3e)
This commit is contained in:
Juergen Spitzmueller 2018-05-11 13:17:39 +02:00
parent 53a108e814
commit e00b11355d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CutAndPaste.cpp
View File

@ -142,6 +142,14 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
// Now remove all out of the pars which is NOT allowed in the // Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required. // 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 // Convert newline to paragraph break in ParbreakIsNewline
if (target_inset->getLayout().parbreakIsNewline() if (target_inset->getLayout().parbreakIsNewline()
|| pars[pit].layout().parbreak_is_newline) { || pars[pit].layout().parbreak_is_newline) {

3
status.23x
View File

@ -173,6 +173,9 @@ What's new
- Fix suprious comma in book and thesis bib preview (bug 11272). - 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 * INTERNALS