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

fpspreadsheet: Remove dummy "rows-repeated" at the end of the table from ods (https://forum.lazarus.freepascal.org/index.php/topic,63385.msg479999.html)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8820 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-05-17 11:21:15 +00:00
parent a5cdbad1bb
commit c5be1f5910
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,8 @@ type
AFont: TsFont; var AFormat: TsCellFormat); AFont: TsFont; var AFormat: TsCellFormat);
procedure ReadTableStyle(AStyleNode: TDOMNode); procedure ReadTableStyle(AStyleNode: TDOMNode);
procedure RemoveDummyRows(ATableNode: TDOMNode);
protected protected
FPointSeparatorSettings: TFormatSettings; FPointSeparatorSettings: TFormatSettings;
procedure AddBuiltinNumFormats; override; procedure AddBuiltinNumFormats; override;
@ -2864,6 +2866,8 @@ begin
ReadShapes(TableNode); ReadShapes(TableNode);
// Collect column styles used // Collect column styles used
ReadColumns(TableNode); ReadColumns(TableNode);
// Remove excess rows added at the end
RemoveDummyRows(TableNode);
// Process each row inside the sheet and process each cell of the row // Process each row inside the sheet and process each cell of the row
ReadRowsAndCells(TableNode); ReadRowsAndCells(TableNode);
// Read conditional formats // Read conditional formats
@ -4886,6 +4890,43 @@ begin
end; end;
end; end;
{ Removes excess rows added at the end of the data block, as usually happens
by export to ods from Excel. Since FPSpreadsheet creates a cell for each of
these dummy cells there would be an extreme time and memory penalty. }
procedure TsSpreadOpenDocReader.RemoveDummyRows(ATableNode: TDOMNode);
var
rowNode, prevNode: TDOMNode;
nodeName: String;
s: String;
rowsRepeated: Integer;
begin
// Read table from the read and remove the rows with a large "number-rows-repeated"
// attribute.
rowNode := ATableNode.LastChild;
while rowNode <> nil do
begin
nodeName := rowNode.NodeName;
if nodeName = 'table:table-row' then
begin
// If, coming from the end, we find a row with a large "number-rows-repeated"
// value
s := GetAttrValue(rowNode, 'table:number-rows-repeated');
if s <> '' then
begin
rowsRepeated := StrToInt(s);
if rowsRepeated > 1000 then // 1000 ok?
begin
prevNode := rowNode.PreviousSibling;
rowNode.Free;
rowNode := prevNode;
continue;
end;
end
end;
rowNode := rowNode.PreviousSibling;
end;
end;
procedure TsSpreadOpenDocReader.ReadStyle_ParagraphProperties(ANode: TDOMNode; procedure TsSpreadOpenDocReader.ReadStyle_ParagraphProperties(ANode: TDOMNode;
var AFormat: TsCellFormat); var AFormat: TsCellFormat);
var var