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

fpspreadsheet: Fix missing repeated cells when reading ods file (bug #0027389)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3919 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-01-31 20:37:44 +00:00
parent 5d1c4ec7c7
commit 8916945ca1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/fpspreadsheet/fpsopendocument.pas
View File

@@ -1921,7 +1921,8 @@ var
rowStyle: TRowStyleData; rowStyle: TRowStyleData;
rowHeight: Single; rowHeight: Single;
autoRowHeight: Boolean; autoRowHeight: Boolean;
i: Integer; i, n: Integer;
cell: PCell;
begin begin
rowsRepeated := 0; rowsRepeated := 0;
row := 0; row := 0;
@@ -2018,6 +2019,14 @@ begin
paramColsRepeated := GetAttrValue(cellNode, 'table:number-columns-repeated'); paramColsRepeated := GetAttrValue(cellNode, 'table:number-columns-repeated');
if paramColsRepeated = '' then paramColsRepeated := '1'; if paramColsRepeated = '' then paramColsRepeated := '1';
n := StrToInt(paramColsRepeated);
if n > 1 then
begin
cell := FWorksheet.FindCell(row, col);
if cell <> nil then
for i:=1 to n-1 do
FWorksheet.CopyCell(row, col, row, col+i);
end;
end end
else else
if nodeName = 'table:covered-table-cell' then if nodeName = 'table:covered-table-cell' then