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

Fix ct in table cell pasting

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-12 17:42:56 +01:00
parent ae892bff98
commit b272e4bfb0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetTabular.cpp
View File

@ -7311,12 +7311,15 @@ bool InsetTabular::pasteClipboard(Cursor & cur)
// FIXME?: why do we need to do this explicitly? (EL)
tabular.cellInset(r2, c2)->setBuffer(tabular.buffer());
if (!lyxrc.ct_markup_copied) {
// do not paste deleted text
inset->acceptChanges();
if (lyxrc.ct_markup_copied) {
// Only change to inserted if ct is active,
// otherwise leave markup as is
if (buffer().params().track_changes)
inset->setChange(Change(Change::INSERTED));
} else
// Resolve all markup to inserted or unchanged
inset->setChange(Change(buffer().params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
Change::INSERTED : Change::UNCHANGED));
cur.pos() = 0;
cur.pit() = 0;
}