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

fpspreadsheet: Fix crash if WorksheetGrid is used within a TFrame.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4668 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-05-27 15:17:37 +00:00
parent 068aaab404
commit 0f9dd4e82b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -77,6 +77,7 @@ type
FSelPen: TsSelPen; FSelPen: TsSelPen;
FHyperlinkTimer: TTimer; FHyperlinkTimer: TTimer;
FHyperlinkCell: PCell; // Selected cell if it stores a hyperlink FHyperlinkCell: PCell; // Selected cell if it stores a hyperlink
// FSetupDelayed: Boolean;
FOnClickHyperlink: TsHyperlinkClickEvent; FOnClickHyperlink: TsHyperlinkClickEvent;
function CalcAutoRowHeight(ARow: Integer): Integer; function CalcAutoRowHeight(ARow: Integer): Integer;
function CalcColWidthFromSheet(AWidth: Single): Integer; function CalcColWidthFromSheet(AWidth: Single): Integer;
@ -189,6 +190,7 @@ type
function CalcWorksheetRowHeight(AValue: Integer): Single; function CalcWorksheetRowHeight(AValue: Integer): Single;
function CellOverflow(ACol, ARow: Integer; AState: TGridDrawState; function CellOverflow(ACol, ARow: Integer; AState: TGridDrawState;
out ACol1, ACol2: Integer; var ARect: TRect): Boolean; out ACol1, ACol2: Integer; var ARect: TRect): Boolean;
procedure CreateHandle; override;
procedure CreateNewWorkbook; procedure CreateNewWorkbook;
procedure DblClick; override; procedure DblClick; override;
procedure DefineProperties(Filer: TFiler); override; procedure DefineProperties(Filer: TFiler); override;
@ -223,7 +225,6 @@ type
AOverrideTextColor: TColor; ARichTextParams: TsRichTextParams; AOverrideTextColor: TColor; ARichTextParams: TsRichTextParams;
AIsRightToLeft: Boolean); AIsRightToLeft: Boolean);
procedure KeyDown(var Key : Word; Shift : TShiftState); override; procedure KeyDown(var Key : Word; Shift : TShiftState); override;
procedure Loaded; override;
procedure MouseDown(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override; procedure MouseDown(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override; procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
@ -1468,6 +1469,11 @@ begin
UpdateRowHeights(AGridRow); UpdateRowHeights(AGridRow);
end; end;
procedure TsCustomWorksheetGrid.CreateHandle;
begin
inherited;
Setup;
end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Creates a new empty workbook into which a file will be loaded. Destroys the Creates a new empty workbook into which a file will be loaded. Destroys the
@ -3824,16 +3830,6 @@ begin
end; end;
end; end;
{@@ ----------------------------------------------------------------------------
Standard method inherited from TCustomGrid. Is overridden to create an
empty workbook
-------------------------------------------------------------------------------}
procedure TsCustomWorksheetGrid.Loaded;
begin
inherited;
if FWorkbookSource = nil then
Setup;
end;
(* (*
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Loads the worksheet into the grid and displays its contents. Loads the worksheet into the grid and displays its contents.
@ -4327,6 +4323,10 @@ begin
if FLockSetup > 0 then if FLockSetup > 0 then
exit; exit;
if not HandleAllocated then
//Avoid crash when accessing the canvas, e.g. in GetDefaultHeaderColWidth
exit;
if (Worksheet = nil) or (Worksheet.GetCellCount = 0) then begin if (Worksheet = nil) or (Worksheet.GetCellCount = 0) then begin
FixedCols := FFrozenCols + FHeaderCount; FixedCols := FFrozenCols + FHeaderCount;
FixedRows := FFrozenRows + FHeaderCount; FixedRows := FFrozenRows + FHeaderCount;