|
@@ -1494,9 +1494,9 @@ type
|
|
Procedure HandleHeaderBands; virtual;
|
|
Procedure HandleHeaderBands; virtual;
|
|
Procedure HandleFooterBands; virtual;
|
|
Procedure HandleFooterBands; virtual;
|
|
procedure HandleDatabands; virtual;
|
|
procedure HandleDatabands; virtual;
|
|
- procedure HandleGroups; virtual;
|
|
|
|
|
|
+ procedure HandleGroupBands; virtual;
|
|
procedure HandleLastGroupFooters; virtual;
|
|
procedure HandleLastGroupFooters; virtual;
|
|
- procedure HandleReportSummaries; virtual;
|
|
|
|
|
|
+ procedure HandleReportSummaryBands; virtual;
|
|
procedure HandleGroupHeader(aBand: TFPReportCustomGroupHeaderBand); virtual;
|
|
procedure HandleGroupHeader(aBand: TFPReportCustomGroupHeaderBand); virtual;
|
|
procedure HandleGroupFooter(aBand: TFPReportCustomGroupFooterBand); virtual;
|
|
procedure HandleGroupFooter(aBand: TFPReportCustomGroupFooterBand); virtual;
|
|
function NoSpaceRemaining: boolean;virtual;
|
|
function NoSpaceRemaining: boolean;virtual;
|
|
@@ -9726,7 +9726,7 @@ begin
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
|
|
-procedure TFPReportLayouter.HandleGroups;
|
|
|
|
|
|
+procedure TFPReportLayouter.HandleGroupBands;
|
|
|
|
|
|
Var
|
|
Var
|
|
I, lHighestGroupWithChange: Integer;
|
|
I, lHighestGroupWithChange: Integer;
|
|
@@ -9929,7 +9929,7 @@ begin
|
|
Report.Variables.BuildAggregates;
|
|
Report.Variables.BuildAggregates;
|
|
CheckNewOrOverFlow(True);
|
|
CheckNewOrOverFlow(True);
|
|
if FHasGroups then
|
|
if FHasGroups then
|
|
- HandleGroups;
|
|
|
|
|
|
+ HandleGroupBands;
|
|
{ handle overflow possibly caused by Group Band just processed. }
|
|
{ handle overflow possibly caused by Group Band just processed. }
|
|
if FOverflowed then
|
|
if FOverflowed then
|
|
Continue;
|
|
Continue;
|
|
@@ -9996,7 +9996,7 @@ begin
|
|
FLastDsgnDataBand := nil;
|
|
FLastDsgnDataBand := nil;
|
|
end;
|
|
end;
|
|
|
|
|
|
-Procedure TFPReportLayouter.HandleReportSummaries;
|
|
|
|
|
|
+procedure TFPReportLayouter.HandleReportSummaryBands;
|
|
|
|
|
|
Var
|
|
Var
|
|
I : integer;
|
|
I : integer;
|
|
@@ -10091,7 +10091,7 @@ begin
|
|
if Assigned(lPageData) then
|
|
if Assigned(lPageData) then
|
|
RunDataLoop(lPageIdx,lPageData);
|
|
RunDataLoop(lPageIdx,lPageData);
|
|
if FHasReportSummaryBand then
|
|
if FHasReportSummaryBand then
|
|
- HandleReportSummaries;
|
|
|
|
|
|
+ HandleReportSummaryBands;
|
|
end;
|
|
end;
|
|
SetPageCount(RTObjects.Count);
|
|
SetPageCount(RTObjects.Count);
|
|
end;
|
|
end;
|