From a0801dd183daf7fbb8773d7753b1e76f1632296e Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 11 Jul 2021 14:04:46 +0000
Subject: [PATCH] fpspreadsheet: Another attempt to fix overwriting of
 frozencols borderline by cells with borders.

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

diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index f3f4da0d3..97337fe84 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -2668,13 +2668,13 @@ begin
     end;
 
     // Left border
-    if GetBorderStyle(ACol, ARow, -1, 0, ACell, bs) and (ACol <> FixedCols) then
+    if GetBorderStyle(ACol, ARow, -1, 0, ACell, bs) and (ACol <> LeftCol) then
       if IsRightToLeft then
         DrawBorderLine(ARect.Right, ARect, drawVert, bs)
       else
         DrawBorderLine(ARect.Left-ord(not IsRightToLeft), ARect, drawVert, bs);
     // Right border
-    if GetBorderStyle(ACol, ARow, +1, 0, ACell, bs) and (ACol + 1 <> FixedCols) then
+    if GetBorderStyle(ACol, ARow, +1, 0, ACell, bs) and (ACol + 1 <> LeftCol) then
       if IsRightToLeft then
         DrawBorderLine(ARect.Left, ARect, drawVert, bs)
       else
@@ -3462,7 +3462,7 @@ procedure TsCustomWorksheetGrid.FixNeighborCellBorders(ACell: PCell);
     neighbor := Worksheet.FindCell(NewRow, NewCol);
     if neighbor <> nil then
     begin
-      border := Worksheet.ReadCelLBorders(neighbor);
+      border := Worksheet.ReadCellBorders(neighbor);
       if AInclude then
       begin
         Include(border, ANewBorder);