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

Append rows and columns if necessary when pasting into table

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-04-23 08:34:53 +02:00
parent 7d021a938c
commit 89f6de9835
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/insets/InsetTabular.cpp
View File

@ -6997,20 +6997,26 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
}
size_t op = 0;
idx_type const cells = loctab->numberofcells;
idx_type cells = loctab->numberofcells;
p = 0;
cols = ocol;
rows = loctab->nrows();
col_type const columns = loctab->ncols();
col_type columns = loctab->ncols();
while (cell < cells && p < len && row < rows &&
while (p < len &&
(p = buf.find_first_of(from_ascii("\t\n"), p)) != docstring::npos)
{
if (p >= len)
break;
switch (buf[p]) {
case '\t':
// we can only set this if we are not too far right
// append column if necessary
if (cols == columns) {
loctab->appendColumn(cols - 1);
columns = loctab->ncols();
cells = loctab->numberofcells;
++cell;
}
if (cols < columns) {
shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
Font const font = bv.textMetrics(&inset->text()).
@ -7032,6 +7038,12 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
}
cols = ocol;
++row;
// append row if necessary
if (row == rows && p < len - 1) {
loctab->appendRow(row - 1);
rows = loctab->nrows();
cells = loctab->numberofcells;
}
if (row < rows)
cell = loctab->cellIndex(row, cols);
break;