From a7913ef0a4838a336c176fdd2677e033fdf72f82 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 3 Jun 2021 09:59:51 +0000
Subject: [PATCH] fpspreadsheet: Do not unmerge cells in Worksheet.EraseCell
 when parameter KeepFormat is true.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8047 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/source/common/fpspreadsheet.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas
index 88a2205a5..74afca4d3 100644
--- a/components/fpspreadsheet/source/common/fpspreadsheet.pas
+++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas
@@ -2013,7 +2013,7 @@ begin
     c := ACell^.Col;
 
     // Unmerge range if the cell is the base of a merged block
-    if IsMergeBase(ACell) then
+    if IsMergeBase(ACell) and not AKeepFormat then
       UnmergeCells(r, c);
 
     // Remove the comment if the cell has one