From 8e8d070239acb2b0c45b372a02041ac9e1c518b0 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 22 Apr 2022 22:10:06 +0000
Subject: [PATCH] fpspreadsheet: Fix drag and drop in worksheet grid to move
 cells and formulas correctly.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8264 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index f3455bd85..2bd60dfb6 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -2295,9 +2295,10 @@ begin
           srccell := Worksheet.FindMergeBase(srccell);
         if srccell <> nil then begin
           destcell := Worksheet.GetCell(r + dr, c + dc);
-          Worksheet.CopyCell(srccell, destcell);
           if dragMove then
-            Worksheet.DeleteCell(srccell);
+            Worksheet.MoveCell(srccell, destcell^.Row, destcell^.Col)
+          else
+            Worksheet.CopyCell(srccell, destcell);
         end;
       end;
   end;