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

Resize table if needed on multi-cell paste

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-06-29 17:51:24 +02:00
parent 3b895bb47a
commit 7f773cf24e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/insets/InsetTabular.cpp
View File

@ -7107,12 +7107,15 @@ bool InsetTabular::pasteClipboard(Cursor & cur)
getSelection(cur, actrow, re, actcol, ce);
}
for (row_type r1 = 0, r2 = actrow;
r1 < paste_tabular->nrows() && r2 < tabular.nrows();
++r1, ++r2) {
for (col_type c1 = 0, c2 = actcol;
c1 < paste_tabular->ncols() && c2 < tabular.ncols();
++c1, ++c2) {
col_type const oldncols = tabular.ncols();
for (row_type r1 = 0, r2 = actrow; r1 < paste_tabular->nrows(); ++r1, ++r2) {
// Append rows if needed
if (r2 == tabular.nrows())
tabular.insertRow(r2 - 1, false);
for (col_type c1 = 0, c2 = actcol; c1 < paste_tabular->ncols(); ++c1, ++c2) {
// Append columns if needed
if (c2 == tabular.ncols())
tabular.insertColumn(c2 - 1, false);
if (paste_tabular->isPartOfMultiColumn(r1, c1) &&
tabular.isPartOfMultiColumn(r2, c2))
continue;
@ -7140,6 +7143,8 @@ bool InsetTabular::pasteClipboard(Cursor & cur)
cur.pit() = 0;
}
}
// amend cursor position if cols have been appended
cur.idx() += actrow * (tabular.ncols() - oldncols);
return true;
}