mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#130483 prevent pasting cell exceeds the border.

Browse Source 
When pasting a table onto another selected table,
cells are cloned from source to target including their
column span and row span. In the test case the
target table can accomodate the first cell of the
merged cells, while the rest go over the table boundary,
hence causing some exception later.

Change-Id: Iae78a9e1689571d4ea2f1ac4853f68c1f7dccb9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88737
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Mark Hung
2020-02-15 01:11:47 +08:00
committed by Noel Grandin
parent d0ca3064b0
commit 5f90c8bc02
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
svx/source/table/tablecontroller.cxx
View File

@@ -2796,14 +2796,24 @@ bool SvxTableController::PasteObject( SdrTableObj const * pPasteTableObj )
// copy cell contents
for( sal_Int32 nRow = 0; nRow < nPasteRows; ++nRow )
{
for( sal_Int32 nCol = 0; nCol < nPasteColumns; ++nCol )
for( sal_Int32 nCol = 0, nTargetCol = aStart.mnCol; nCol < nPasteColumns; ++nCol )
{
CellRef xTargetCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( aStart.mnCol + nCol, aStart.mnRow + nRow ).get() ) );
CellRef xTargetCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nTargetCol, aStart.mnRow + nRow ).get() ) );
if( xTargetCell.is() && !xTargetCell->isMerged() )
{
xTargetCell->AddUndo();
xTargetCell->cloneFrom( dynamic_cast< Cell* >( xPasteTable->getCellByPosition( nCol, nRow ).get() ) );
nCol += xTargetCell->getColumnSpan() - 1;
CellRef xSourceCell(dynamic_cast<Cell*>(xPasteTable->getCellByPosition(nCol, nRow).get()));
if (xSourceCell.is())
{
xTargetCell->AddUndo();
// Prevent cell span exceeding the pasting range.
if (nColumns < nTargetCol + xSourceCell->getColumnSpan())
xTargetCell->replaceContentAndFormating(xSourceCell);
else
xTargetCell->cloneFrom(xSourceCell);
nCol += xSourceCell->getColumnSpan() - 1;
nTargetCol += xTargetCell->getColumnSpan();
}
}
}
}