From 9369e4d3ef15b7924f5a77fddf8689473082a310 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 13 Apr 2019 20:21:33 +0000
Subject: [PATCH] fpspreadsheet: Fix cells being pasted in grid from clipboard
 when worksheet is protected.

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

diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas
index f680d3f29..241307b34 100644
--- a/components/fpspreadsheet/source/common/fpspreadsheet.pas
+++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas
@@ -1031,7 +1031,6 @@ begin
         fmt.NumberFormatIndex := destSheet.Workbook.AddNumberFormat(nfs);
       end;
     end;
-
     destSheet.WriteCellFormat(AToCell, fmt);
   end;
 end;
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index 02ef52d44..ff66110ab 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -4662,12 +4662,15 @@ begin
     VK_F2:
       FEnhEditMode := true;
     VK_DELETE:
-      if not FReadOnly then begin
+      if (not FReadOnly) and (goEditing in Options) then begin
         if (ssCtrl in Shift) then
           Worksheet.DeleteSelection
         else
           Worksheet.EraseSelection(true);
       end;
+    VK_X, VK_V:
+      if (Shift = [ssCtrl]) and (Worksheet.IsProtected or not (goEditing in Options)) then
+        Key := 0;
   end;
 
   inherited;