Sheet: Warn user when cell merge is not done because already merge cells in the range

Partially fixes #6744
This commit is contained in:
0penBrain
2022-04-13 15:18:55 +02:00
committed by Chris Hennes
parent b33478f8d0
commit 7edcc8358c

View File

@@ -1016,8 +1016,10 @@ bool PropertySheet::mergeCells(CellAddress from, CellAddress to)
// Check that this merge is not overlapping other merged cells
for (int r = from.row(); r <= to.row(); ++r) {
for (int c = from.col(); c <= to.col(); ++c) {
if (mergedCells.find(CellAddress(r, c)) != mergedCells.end())
return false;
if (mergedCells.find(CellAddress(r, c)) != mergedCells.end()) {
Base::Console().Warning("Cells merging is not possible when already merged cells are in the target range.\n");
return false;
}
}
}