Browse Source

* Patch from Pascal Riekenberg: better naming for TOverFLowAction

git-svn-id: trunk@37502 -
michael 7 years ago
parent
commit
fc638ed7ba
1 changed files with 7 additions and 7 deletions
  1. 7 7
      packages/fcl-report/src/fpreport.pp

+ 7 - 7
packages/fcl-report/src/fpreport.pp

@@ -1549,7 +1549,7 @@ type
 
 
 
 
   { TFPReportLayouter }
   { TFPReportLayouter }
-  TOverFlowAction = (oaStartAgain,oaSameBandAgain);
+  TOverFlowAction = (oaBandWithChilds,oaSingleBand);
   TOverFlowActions = Set of TOverFlowAction;
   TOverFlowActions = Set of TOverFlowAction;
 
 
   TFPReportLayouter = Class(TComponent)
   TFPReportLayouter = Class(TComponent)
@@ -10670,7 +10670,7 @@ begin
     if aBand.KeepTogetherWithChildren then
     if aBand.KeepTogetherWithChildren then
     begin
     begin
       { complete band with child bands move to next column/page }
       { complete band with child bands move to next column/page }
-      Include(Result,oaStartAgain);
+      Include(Result,oaBandWithChilds);
       { remove all overflowed bands and start again on new column/page }
       { remove all overflowed bands and start again on new column/page }
       RemoveBandsFromPage(aHandledBands);
       RemoveBandsFromPage(aHandledBands);
       //writeln('   complete move to next column/page');
       //writeln('   complete move to next column/page');
@@ -10710,7 +10710,7 @@ begin
     else
     else
     begin
     begin
       { only current band moves to next column/page }
       { only current band moves to next column/page }
-      Include(Result,oaSameBandAgain);
+      Include(Result,oaSingleBand);
       { remove band from current page }
       { remove band from current page }
       aRTBand.Page.RemoveChild(aRTBand);
       aRTBand.Page.RemoveChild(aRTBand);
       { correct LastYPos }
       { correct LastYPos }
@@ -10781,7 +10781,7 @@ begin
       while Assigned(lBand) do
       while Assigned(lBand) do
       begin
       begin
         try
         try
-          Exclude(overFlowActions,oaSameBandAgain);
+          Exclude(overFlowActions,oaSingleBand);
           lRTBand := CommonRuntimeBandProcessing(lBand);
           lRTBand := CommonRuntimeBandProcessing(lBand);
           if lRTBand=Nil then
           if lRTBand=Nil then
             Continue;
             Continue;
@@ -10790,18 +10790,18 @@ begin
           UpdateSpaceRemaining(lRTBand, aBand.NeedsUpdateYPos);
           UpdateSpaceRemaining(lRTBand, aBand.NeedsUpdateYPos);
           if NoSpaceRemaining then
           if NoSpaceRemaining then
             overFlowActions := HandleOverflowedBands(lHandledBands, aBand, lRTBand);
             overFlowActions := HandleOverflowedBands(lHandledBands, aBand, lRTBand);
-          if (oaStartAgain in overFlowActions) then
+          if (oaBandWithChilds in overFlowActions) then
             break;
             break;
           if Assigned(lRTBand) then
           if Assigned(lRTBand) then
             aBand.AfterPrintBand(Self, lRTBand);
             aBand.AfterPrintBand(Self, lRTBand);
         finally
         finally
-          if not (oaSameBandAgain in overFlowActions) then
+          if not (oaSingleBand in overFlowActions) then
             lBand := lBand.ChildBand;
             lBand := lBand.ChildBand;
           if (overFlowActions<>[]) then
           if (overFlowActions<>[]) then
             Report.FRTIsOverflowed := True;
             Report.FRTIsOverflowed := True;
         end;
         end;
       end; { while Assigned(lBand) }
       end; { while Assigned(lBand) }
-    Until not (oaStartAgain in OverFlowActions);
+    Until not (oaBandWithChilds in OverFlowActions);
     if (aBand is TFPReportCustomGroupHeaderBand) and
     if (aBand is TFPReportCustomGroupHeaderBand) and
     not Report.FRTInRepeatedGroupHeader and
     not Report.FRTInRepeatedGroupHeader and
     (lHandledBands.Count > 0) then
     (lHandledBands.Count > 0) then