paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Protect colwidth/rowheight when col/row is hidden.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7079 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2019-07-27 20:41:09 +00:00
parent a66ccaf563
commit d9a8c87eef
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/fpspreadsheet/source/common/fpspreadsheet.pas
View File

@ -8273,9 +8273,12 @@ begin
if ARow = UNASSIGNED_ROW_COL_INDEX then if ARow = UNASSIGNED_ROW_COL_INDEX then
exit; exit;
lRow := GetRow(ARow); lRow := GetRow(ARow);
lRow^.Height := FWorkbook.ConvertUnits(AHeight, AUnits, FWorkbook.FUnits); if (croHidden in lRow^.Options) then
lRow^.RowHeightType := ARowHeightType; begin
ChangedRow(ARow); lRow^.Height := FWorkbook.ConvertUnits(AHeight, AUnits, FWorkbook.FUnits);
lRow^.RowHeightType := ARowHeightType;
ChangedRow(ARow);
end;
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
@ -8351,9 +8354,12 @@ begin
if ACol = UNASSIGNED_ROW_COL_INDEX then if ACol = UNASSIGNED_ROW_COL_INDEX then
exit; exit;
lCol := GetCol(ACol); lCol := GetCol(ACol);
lCol^.Width := FWorkbook.ConvertUnits(AWidth, AUnits, FWorkbook.FUnits); if not (croHidden in lCol^.Options) then
lCol^.ColWidthType := AColWidthType; begin
ChangedCol(ACol); lCol^.Width := FWorkbook.ConvertUnits(AWidth, AUnits, FWorkbook.FUnits);
lCol^.ColWidthType := AColWidthType;
ChangedCol(ACol);
end;
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------