From b6e1a4c4957f5da5c01d4f3cad70b2b68a3aefdb Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Thu, 19 Apr 2018 20:30:43 +0000 Subject: [PATCH] fpspreadsheet: Fix WorksheetGrid not being able to delete a cell block. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6323 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/source/common/fpspreadsheet.pas | 7 +++++++ .../fpspreadsheet/source/visual/fpspreadsheetgrid.pas | 2 ++ 2 files changed, 9 insertions(+) diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas index 295d74ea2..abe9fc6f7 100644 --- a/components/fpspreadsheet/source/common/fpspreadsheet.pas +++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas @@ -2144,6 +2144,8 @@ end; -------------------------------------------------------------------------------} procedure TsWorksheet.DeleteCell(ACell: PCell); {$warning TODO: Shift cells to the right/below !!! ??? } +var + r, c: Cardinal; begin if ACell = nil then exit; @@ -2159,8 +2161,13 @@ begin exit; end; + r := ACell^.Row; + c := ACell^.Col; + // Destroy the cell, and remove it from the tree RemoveAndFreeCell(ACell^.Row, ACell^.Col); + + ChangedCell(r, c); end; {@@ ---------------------------------------------------------------------------- diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas index b58cdbd97..ad7c1e147 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas @@ -4630,6 +4630,8 @@ begin end; VK_F2: FEnhEditMode := true; + VK_DELETE: + Worksheet.DeleteSelection; end; inherited;