TRxDBGridPrint - fix AV with TfrDesigner

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3451 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2014-08-08 12:28:58 +00:00
parent 2de7d41fef
commit e8b3066a10

View File

@ -419,11 +419,15 @@ end;
function TRxDBGridPrint.DoExecTools: boolean; function TRxDBGridPrint.DoExecTools: boolean;
var var
C:integer; C:integer;
SaveDesign: TfrReportDesigner;
begin begin
Result:=false; Result:=false;
if (RxDBGrid = nil) or (RxDBGrid.DataSource = nil) or (RxDBGrid.DataSource.Dataset = nil) then if (RxDBGrid = nil) or (RxDBGrid.DataSource = nil) or (RxDBGrid.DataSource.Dataset = nil) then
Exit; Exit;
SaveDesign:=frDesigner;
frDesigner:=nil;
FDataSet := RxDBGrid.Datasource.Dataset; FDataSet := RxDBGrid.Datasource.Dataset;
FReport:=TfrReport.Create(Self); FReport:=TfrReport.Create(Self);
FReport.OnPrintColumn:=@OnPrintColumn; FReport.OnPrintColumn:=@OnPrintColumn;
@ -451,6 +455,7 @@ begin
FreeAndNil(FColumnDataSet); FreeAndNil(FColumnDataSet);
FreeAndNil(FReportDataSet); FreeAndNil(FReportDataSet);
FreeAndNil(FReport); FreeAndNil(FReport);
frDesigner:=SaveDesign;
end; end;
end; end;