FOP-3253: Use rest page when we cant fit on last pageHEADmain

1 files changed, 4 insertions, 1 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
index ae1825dd4..4152ee996 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
@@ -475,11 +475,14 @@ public class PageBreaker extends AbstractBreaker {
                 //Replace last page
                 pslm.setCurrentPage(pageProvider.getPage(false, currentPageNum));
             } else {
-                setLastPageIndex(currentPageNum + 1);
+                if (optimalPageCount <= pslm.getCurrentPV().getBodyRegion().getMainReference().getColumnCount()) {
+                    setLastPageIndex(currentPageNum + 1);
+                }
                 //Last page-master cannot hold the content.
                 //Add areas now...
                 addAreas(alg, restartPoint, partCount - restartPoint, originalList, effectiveList);
                 if (!ipdChange && pslm.currentPageNum == currentPageNum) {
+                    setLastPageIndex(currentPageNum + 1);
                     //...and add a blank last page
                     pslm.setCurrentPage(pslm.makeNewPage(true));
                 }