diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-07-17 12:15:28 +1000 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-07-18 22:16:14 +0200 |
commit | 7e803a348a020bc48a039c4f7f098ae17843c534 (patch) | |
tree | 1a5a24737b2257716382affc5d02f78660c53432 /sc/source/core/data | |
parent | 235a74d2e9d0e5e991777ef6d1a1625dab009670 (diff) |
tdf#126421: don't limit pasted data to allocated columns in destination
Change-Id: Ic30360795c5dac1dc232f95bd25f5a11946c7dee
Reviewed-on: https://gerrit.libreoffice.org/75738
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2d4ccc58e9ef3b98a88407e1a7a3abf3379f0d20)
Reviewed-on: https://gerrit.libreoffice.org/75756
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sc/source/core/data')
-rw-r--r-- | sc/source/core/data/table2.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 2aee672f8ad2..5edff4b4889b 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -670,17 +670,20 @@ bool ScTable::InitColumnBlockPosition( sc::ColumnBlockPosition& rBlockPos, SCCOL return true; } +// pTable is source + void ScTable::CopyFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCCOL nDx, SCROW nDy, ScTable* pTable ) { - if (nCol2 > aCol.size() - 1) - nCol2 = aCol.size() - 1; + if (nCol2 > MAXCOL) + nCol2 = MAXCOL; if (nRow2 > MAXROW) nRow2 = MAXROW; if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2)) { + CreateColumnIfNotExists(nCol2); for ( SCCOL i = nCol1; i <= nCol2; i++) { pTable->CreateColumnIfNotExists(i - nDx); |