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

* Do not allow to create circular dependencies when setting GroupHeaders.ParentGroupHeader (bug ID #33365)

Browse Source 
git-svn-id: trunk@57476 -
This commit is contained in:
michael 2018-03-09 07:37:47 +00:00
parent 90151e720e
commit 8c4f984d95
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/fpreport/design/regfpdesigner.pp
View File

@ -124,6 +124,12 @@ Type
Function BandTypes : TFPReportBandTypes; override;
end;
{ TParentGroupHeaderBandPropertyEditor }
TParentGroupHeaderBandPropertyEditor = Class(TGroupHeaderBandPropertyEditor)
Public
function BandAllowed(B: TFPReportCustomBand): Boolean; override;
end;
Procedure RegisterFPReportPropEditors;
@ -139,7 +145,7 @@ begin
RegisterPropertyEditor(TypeInfo(TFPReportCustomDataFooterBand), TFPReportCustomBand, 'FooterBand', TDataFooterBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportCustomDataHeaderBand), TFPReportCustomBand, 'HeaderBand', TDataHeaderBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportCustomDataBand), TFPReportCustomBand, 'MasterBand', TDataBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportCustomGroupHeaderBand),TFPReportCustomGroupHeaderBand, 'ParentGroupHeader', TGroupHeaderBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportCustomGroupHeaderBand),TFPReportCustomGroupHeaderBand, 'ParentGroupHeader', TParentGroupHeaderBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportCustomGroupHeaderBand),TFPReportCustomGroupFooterBand, 'GroupHeader', TGroupHeaderBandPropertyEditor);
RegisterPropertyEditor(TypeInfo(TFPReportColor),TFPReportComponent,'Color',TFPreportColorPropertyEditor);
@ -181,6 +187,28 @@ begin
Result:=N;
end;
{ TParentGroupHeaderBandPropertyEditor }
function TParentGroupHeaderBandPropertyEditor.BandAllowed(B: TFPReportCustomBand): Boolean;
Var
G,P : TFPReportCustomGroupHeaderBand;
begin
Result:=inherited BandAllowed(B);
if Result then
begin
P:=B as TFPReportCustomGroupHeaderBand;
G:=GetComponent(0) as TFPReportCustomGroupHeaderBand;
While Result and (P<>Nil) do
begin
Result:=P<>G;
P:=TFPReportGroupHeaderBand(P).ParentGroupHeader;
end;
end;
end;
{ TFPreportColorPropertyEditor }
function TFPreportColorPropertyEditor.OrdValueToVisualValue(OrdValue: longint): string;