paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-23 22:41:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #33328, reset modified flag must be done in callback, if set

Browse Source 
git-svn-id: trunk@57452 -
This commit is contained in:
michael 2018-03-06 07:57:39 +00:00
parent 1f3b852e69
commit b84e7d6fa8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpreport/design/fpreportdesigner.pp
View File

@ -102,6 +102,7 @@ begin
J:=report as TFPJSONReport; J:=report as TFPJSONReport;
J.DesignTimeJSON.Clear; J.DesignTimeJSON.Clear;
J.SavetoJSON(J.DesignTimeJSON); J.SavetoJSON(J.DesignTimeJSON);
(Sender as TFPReportDesignerForm).ResetModified;
end; end;
procedure TFPReportDesigner.ConfigDesigner(F : TFPReportDesignerForm); procedure TFPReportDesigner.ConfigDesigner(F : TFPReportDesignerForm);

8
components/fpreport/design/frmfpreportdesignermain.pp
View File

@ -325,6 +325,7 @@ type
function PageDesigner(Aindex : Integer) : TFPReportDesignerControl; function PageDesigner(Aindex : Integer) : TFPReportDesignerControl;
Property Modified : Boolean Read GetModified Write SetModified; Property Modified : Boolean Read GetModified Write SetModified;
public public
procedure ResetModified; virtual;
procedure DesignReport; virtual; procedure DesignReport; virtual;
procedure StopDesigning; virtual; procedure StopDesigning; virtual;
procedure PreviewReport; virtual; procedure PreviewReport; virtual;
@ -336,7 +337,7 @@ type
Property FileName : String Read FFileName Write FFileName; Property FileName : String Read FFileName Write FFileName;
Property ReportDesignData : TDesignReportDataCollection Read FReportDesignData; Property ReportDesignData : TDesignReportDataCollection Read FReportDesignData;
Property DesignOptions : TFPReportDesignOptions Read FDesignOptions Write SetDesignOptions; Property DesignOptions : TFPReportDesignOptions Read FDesignOptions Write SetDesignOptions;
// If these are set, they override the default handling. // If these are set, they override the default handling. You must set the modified
Property OnSaveReport : TNotifyEvent Read FOnSaveReport Write FOnSaveReport; Property OnSaveReport : TNotifyEvent Read FOnSaveReport Write FOnSaveReport;
Property OnNewReport : TNotifyEvent Read FOnNewReport Write FOnNewReport; Property OnNewReport : TNotifyEvent Read FOnNewReport Write FOnNewReport;
Property OnOpenReport : TNotifyEvent Read FOnOpenReport Write FOnOpenReport; Property OnOpenReport : TNotifyEvent Read FOnOpenReport Write FOnOpenReport;
@ -741,6 +742,11 @@ begin
Result:=Nil; Result:=Nil;
end; end;
procedure TFPReportDesignerForm.ResetModified;
begin
Modified:=False;
end;
procedure TFPReportDesignerForm.AAddMemoExecute(Sender: TObject); procedure TFPReportDesignerForm.AAddMemoExecute(Sender: TObject);
begin begin
CurrentDesigner.AddElement(TFPReportMemo); CurrentDesigner.AddElement(TFPReportMemo);