From e63ff6ab6cb94163a01e67e75e94d2e28732acdc Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 10 Sep 2014 16:44:56 +0000 Subject: [PATCH] fpspreadsheet: Fix location of merged cells in TsWorksheetGrid git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3539 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/fpspreadsheetgrid.pas | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas index db1a017c9..61d858f10 100644 --- a/components/fpspreadsheet/fpspreadsheetgrid.pas +++ b/components/fpspreadsheet/fpspreadsheetgrid.pas @@ -3155,15 +3155,25 @@ end; } procedure TsCustomWorksheetGrid.MergeCells; begin - FWorksheet.MergeCells(Selection.Top, Selection.Left, Selection.Bottom, Selection.Right); + FWorksheet.MergeCells( + GetWorksheetRow(Selection.Top), + GetWorksheetCol(Selection.Left), + GetWorksheetRow(Selection.Bottom), + GetWorksheetCol(Selection.Right) + ); end; {@@ - Merges the selected cells to a single large cell + Splits a merged cell block into single cells } procedure TsCustomWorksheetGrid.UnmergeCells; begin - FWorksheet.UnmergeCells(Selection.Top, Selection.Left, Selection.Bottom, Selection.Right); + FWorksheet.UnmergeCells( + GetWorksheetRow(Selection.Top), + GetWorksheetCol(Selection.Left), + GetWorksheetRow(Selection.Bottom), + GetWorksheetCol(Selection.Right) + ); end; {@@