pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix the same issue for columns that was fixed in prev commit for rows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6640 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-09-10 15:22:41 +00:00
parent 4260c5bd5e
commit 920fae9fe0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/source/common/fpsreaderwriter.pas
View File

@ -378,11 +378,11 @@ begin
lCol := PCol(sheet.Cols[c]); lCol := PCol(sheet.Cols[c]);
if not SameValue(lCol^.Width, w, EPS) then if not SameValue(lCol^.Width, w, EPS) then
break; break;
if sheet.FindNextCellInCol(0, c) <> nil then if sheet.FindNextCellInCol(0, lCol^.Col) <> nil then
break; break;
if lCol.Hidden then if lCol^.Hidden then
break; break;
sheet.RemoveCol(c); sheet.RemoveCol(lCol^.Col);
dec(c); dec(c);
end; end;
end; end;
@ -410,7 +410,7 @@ begin
// ...and delete all column records with non-default format // ...and delete all column records with non-default format
for c := sheet.Cols.Count-1 downto 0 do begin for c := sheet.Cols.Count-1 downto 0 do begin
lCol := PCol(sheet.Cols[c]); 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; end;
end; end;
@ -460,7 +460,6 @@ begin
if (lRow^.FormatIndex = 0) and (not lRow^.Hidden) then if (lRow^.FormatIndex = 0) and (not lRow^.Hidden) then
sheet.RemoveRow(lRow^.Row); sheet.RemoveRow(lRow^.Row);
end; end;
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------