From 920fae9fe0e778f665b51fbc6225af462cf58fa7 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Mon, 10 Sep 2018 15:22:41 +0000 Subject: [PATCH] fpspreadsheet: Fix the same issue for columns that was fixed in prev commit for rows git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6640 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../fpspreadsheet/source/common/fpsreaderwriter.pas | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/fpspreadsheet/source/common/fpsreaderwriter.pas b/components/fpspreadsheet/source/common/fpsreaderwriter.pas index 0546537a1..17fb9952b 100644 --- a/components/fpspreadsheet/source/common/fpsreaderwriter.pas +++ b/components/fpspreadsheet/source/common/fpsreaderwriter.pas @@ -378,11 +378,11 @@ begin lCol := PCol(sheet.Cols[c]); if not SameValue(lCol^.Width, w, EPS) then break; - if sheet.FindNextCellInCol(0, c) <> nil then + if sheet.FindNextCellInCol(0, lCol^.Col) <> nil then break; - if lCol.Hidden then + if lCol^.Hidden then break; - sheet.RemoveCol(c); + sheet.RemoveCol(lCol^.Col); dec(c); end; end; @@ -410,7 +410,7 @@ begin // ...and delete all column records with non-default format for c := sheet.Cols.Count-1 downto 0 do begin lCol := PCol(sheet.Cols[c]); - if (lCol^.FormatIndex = 0) and (not lCol^.Hidden) then sheet.RemoveCol(c); + if (lCol^.FormatIndex = 0) and (not lCol^.Hidden) then sheet.RemoveCol(lCol^.Col); end; end; end; @@ -460,7 +460,6 @@ begin if (lRow^.FormatIndex = 0) and (not lRow^.Hidden) then sheet.RemoveRow(lRow^.Row); end; - end; {@@ ----------------------------------------------------------------------------