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

fpspreadsheet: Make sure that the local variable commentcell_rct in TxCustomWorksheetGrid.InternalDrawRow is initialized (issue #33413, patch by Lagunov Aleksey).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6234 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-03-11 21:06:49 +00:00
parent 01daae7460
commit a70231ab75
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/source/common/fpstypes.pas
View File

@ -531,6 +531,9 @@ const
(LineStyle: lsThin; Color: scBlack) (LineStyle: lsThin; Color: scBlack)
); );
{@@ Border style to be used for "no border"}
NO_CELL_BORDER: TsCellBorderStyle = (LineStyle: lsThin; Color: scNotDefined);
type type
{@@ Style of fill pattern for cell backgrounds } {@@ Style of fill pattern for cell backgrounds }
TsFillStyle = (fsNoFill, fsSolidFill, TsFillStyle = (fsNoFill, fsSolidFill,

12
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -800,9 +800,6 @@ type
property OnContextPopup; property OnContextPopup;
end; end;
const
NO_CELL_BORDER: TsCellBorderStyle = (LineStyle: lsThin; Color: scNotDefined);
var var
{@@ Default number of columns prepared for a new empty worksheet } {@@ Default number of columns prepared for a new empty worksheet }
DEFAULT_COL_COUNT: Integer = 26; DEFAULT_COL_COUNT: Integer = 26;
@ -4424,6 +4421,7 @@ begin
while (gc <= gcLast) do begin while (gc <= gcLast) do begin
gr := ARow; gr := ARow;
rct := AClipRect; rct := AClipRect;
commentcell_rct := Rect(0, 0, 0, 0);
// FDrawingCell is the cell which is currently being painted. We store // FDrawingCell is the cell which is currently being painted. We store
// it to avoid excessive calls to "FindCell". // it to avoid excessive calls to "FindCell".
FDrawingCell := nil; FDrawingCell := nil;
@ -4436,9 +4434,7 @@ begin
// single cell // single cell
FDrawingCell := cell; FDrawingCell := cell;
if Worksheet.HasComment(cell) then if Worksheet.HasComment(cell) then
commentcell_rct := CellRect(gc, gr) commentcell_rct := CellRect(gc, gr);
else
commentcell_rct := Rect(0,0,0,0);
// Special treatment of overflowing cells // Special treatment of overflowing cells
if FTextOverflow then if FTextOverflow then
begin begin
@ -4495,9 +4491,7 @@ begin
begin begin
gr := GetGridRow(sr1); gr := GetGridRow(sr1);
if Worksheet.HasComment(FDrawingCell) then if Worksheet.HasComment(FDrawingCell) then
commentcell_rct := CellRect(GetGridCol(sc2), gr) commentcell_rct := CellRect(GetGridCol(sc2), gr);
else
commentcell_rct := Rect(0,0,0,0);
ColRowToOffSet(False, True, gr, rct.Top, tmp); ColRowToOffSet(False, True, gr, rct.Top, tmp);
ColRowToOffSet(False, True, gr + integer(sr2) - integer(sr1), tmp, rct.Bottom); ColRowToOffSet(False, True, gr + integer(sr2) - integer(sr1), tmp, rct.Bottom);
gc := GetGridCol(sc1); gc := GetGridCol(sc1);