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

fpspreadsheet: Fix reading of repeated columns from ODS files (introduced by r6636).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6645 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-09-11 21:24:51 +00:00
parent af0d61f36d
commit 74f61771c9
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@@ -1119,11 +1119,7 @@ begin
begin begin
colData := TColumnData(FColumnList[i]); colData := TColumnData(FColumnList[i]);
colIndex := colData.Col; colIndex := colData.Col;
(*
writeLn('FColumnList[',i,']:');
WriteLn(' colIndex', colData.Col);
WriteLn(' hidden: ', colData.Hidden);
*)
// Skip column records beyond the last data column - there's a bug in OO/LO // Skip column records beyond the last data column - there's a bug in OO/LO
// which adds column records up to the max column limit. // which adds column records up to the max column limit.
if colIndex > lastOccCol then if colIndex > lastOccCol then
@@ -1961,7 +1957,7 @@ var
colsRepeated := StrToInt(s); colsRepeated := StrToInt(s);
inc(col); inc(col);
if (defCellStyleIndex > -1) or isHidden then begin if (defCellStyleIndex > -1) or isHidden then begin
for j := 0 to colsRepeated-1 do for j := 1 to colsRepeated-1 do // was: j := 0 to ...
begin begin
coldata := TColumnData.Create; coldata := TColumnData.Create;
colData.Col := col + j; colData.Col := col + j;

2
components/fpspreadsheet/tests/formulatests.pas
View File

@@ -961,7 +961,7 @@ begin
end; end;
finally finally
book.Free; book.Free;
deleteFile(tempFile); DeleteFile(tempFile);
end; end;
end; end;