paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 11:39:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lazreport, make DesignReport return modalresult on close designer, from Aleksey Lagunov

Browse Source 
git-svn-id: trunk@43260 -
This commit is contained in:
jesus 2013-10-16 21:25:59 +00:00
parent c42232d6f1
commit bdcdae86bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lazreport/source/lr_class.pas
View File

@ -1108,7 +1108,7 @@ type
procedure LoadPreparedReport(const FName: String); procedure LoadPreparedReport(const FName: String);
procedure SavePreparedReport(const FName: String); procedure SavePreparedReport(const FName: String);
// report manipulation methods // report manipulation methods
procedure DesignReport; function DesignReport: Integer;
function PrepareReport: Boolean; function PrepareReport: Boolean;
procedure ExportTo(FilterClass: TfrExportFilterClass; aFileName: String); procedure ExportTo(FilterClass: TfrExportFilterClass; aFileName: String);
procedure ShowReport; procedure ShowReport;
@ -9491,7 +9491,7 @@ begin
end; end;
// report manipulation methods // report manipulation methods
procedure TfrReport.DesignReport; function TfrReport.DesignReport: Integer;
var var
HF: String; HF: String;
begin begin
@ -9503,11 +9503,14 @@ begin
if not Assigned(frDesigner) and Assigned(ProcedureInitDesigner) then if not Assigned(frDesigner) and Assigned(ProcedureInitDesigner) then
ProcedureInitDesigner(); ProcedureInitDesigner();
if frDesigner <> nil then if frDesigner <> nil then
begin
{$IFDEF MODALDESIGNER} {$IFDEF MODALDESIGNER}
frDesigner.ShowModal; Result:=frDesigner.ShowModal;
{$ELSE} {$ELSE}
frDesigner.Show; frDesigner.Show;
Result:=mrOk;
{$ENDIF} {$ENDIF}
end;
Application.HelpFile := HF; Application.HelpFile := HF;
end; end;