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

fpspreadsheet: Fix detection of common row heights.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5318 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-11-06 08:37:07 +00:00
parent 5d1c8de578
commit 53062a527e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@ procedure TsCustomSpreadReader.FixRows(AWorkSheet: TsWorksheet);
const const
EPS = 1E-3; EPS = 1E-3;
var var
r: Cardinal; r, rLast: Cardinal;
h: Single; h: Single;
lRow: PRow; lRow: PRow;
begin begin
@ -429,11 +429,21 @@ begin
exit; exit;
end; end;
// If there are more rows than row records and the common row height is not
// the default row height (i.e. the row height of the non-record rows) then
// the row heights are different
rLast := AWorksheet.GetLastRowIndex;
if (AWorksheet.Rows.Count > 0) and
(rLast <> PRow(AWorksheet.Rows[AWorksheet.Rows.Count-1]).Row) and
not SameValue(h, AWorksheet.ReadDefaultRowHeight(FWorkbook.Units), EPS)
then
exit;
// At this point we know that all rows have the same height. We pass this // At this point we know that all rows have the same height. We pass this
// to the DefaultRowHeight ... // to the DefaultRowHeight ...
AWorksheet.WriteDefaultRowHeight(h, FWorkbook.Units); AWorksheet.WriteDefaultRowHeight(h, FWorkbook.Units);
// ... and delete all row records with non-default format. // ... and delete all row records with default format.
for r := AWorksheet.Rows.Count-1 downto 0 do begin for r := AWorksheet.Rows.Count-1 downto 0 do begin
lRow := PRow(AWorksheet.Rows[r]); lRow := PRow(AWorksheet.Rows[r]);
if lRow^.FormatIndex = 0 then AWorksheet.RemoveRow(r); if lRow^.FormatIndex = 0 then AWorksheet.RemoveRow(r);