anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix assertion when pasting paragraph with insets in lyxrc.ct_markup_copied

Browse Source 
This has to be done after the inset buffers have been initialized.

(cherry picked from commit 9198ed5965)
This commit is contained in:
Juergen Spitzmueller 2024-04-06 09:47:22 +02:00
parent 36f8cd0a8e
commit 87b3bea823
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/CutAndPaste.cpp
View File

@ -292,26 +292,6 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
if (!target_inset->insetAllowed(inset->lyxCode()))
tmpbuf->eraseChar(i--, false);
}
if (lyxrc.ct_markup_copied) {
// Only remove deleted text and change
// the rest to inserted if ct is active,
// otherwise leave markup as is
if (buffer.params().track_changes) {
if (tmpbuf->size() > 0) {
if (!isFullyDeleted(insertion))
tmpbuf->acceptChanges(0, tmpbuf->size());
else
tmpbuf->rejectChanges(0, tmpbuf->size());
}
tmpbuf->setChange(Change(Change::INSERTED));
}
} else
// Resolve all markup to inserted or unchanged
// Deleted text has already been removed on copy
// (copySelectionHelper)
tmpbuf->setChange(Change(buffer.params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
bool const target_empty = pars[pit].empty();
@ -495,6 +475,31 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
}
insertion.swap(in.paragraphs());
// We need to do this here, after the inset handling above,
// as acceptChanges() and rejectChanges() might access inset buffers.
tmpbuf = insertion.begin();
for (; tmpbuf != insertion.end(); ++tmpbuf) {
if (lyxrc.ct_markup_copied) {
// Only remove deleted text and change
// the rest to inserted if ct is active,
// otherwise leave markup as is
if (buffer.params().track_changes) {
if (tmpbuf->size() > 0) {
if (!isFullyDeleted(insertion))
tmpbuf->acceptChanges(0, tmpbuf->size());
else
tmpbuf->rejectChanges(0, tmpbuf->size());
}
tmpbuf->setChange(Change(Change::INSERTED));
}
} else
// Resolve all markup to inserted or unchanged
// Deleted text has already been removed on copy
// (copySelectionHelper)
tmpbuf->setChange(Change(buffer.params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
// Split the paragraph for inserting the buf if necessary.
if (!target_empty)
breakParagraphConservative(buffer.params(), pars, pit, pos);