FOP-3186: Only support 1 column for redo of layout without page pos only

1 files changed, 11 insertions, 2 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
index f6bf00253..40b518af3 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.pagination.RegionBody;
 import org.apache.fop.layoutmgr.BreakingAlgorithm.KnuthNode;
 import org.apache.fop.traits.MinOptMax;
 import org.apache.fop.util.ListUtil;
@@ -415,8 +416,7 @@ public abstract class AbstractBreaker {
                     onLastPageAndIPDChanges = (lastPageHasIPDChange(optimalPageCount) && !thereIsANonRestartableLM(alg)
                             && (shouldRedoLayout() || (wasLayoutRedone() && optimalPageCount > 1)));
                 }
-                if ((ipdChangesOnNextPage || hasMoreContent() || optimalPageCount > 1)
-                        && pslm != null && pslm.getCurrentPage().isPagePositionOnly) {
+                if (shouldRedoLayoutWithoutPagePositionOnly(ipdChangesOnNextPage, optimalPageCount)) {
                     return false;
                 }
                 if (alg.handlingFloat()) {
@@ -465,6 +465,15 @@ public abstract class AbstractBreaker {
         return true;
     }
 
+    private boolean shouldRedoLayoutWithoutPagePositionOnly(boolean ipdChangesOnNextPage, int optimalPageCount) {
+        if ((ipdChangesOnNextPage || hasMoreContent() || optimalPageCount > 1)
+                && pslm != null && pslm.getCurrentPage().isPagePositionOnly) {
+            RegionBody rb = (RegionBody)pslm.getCurrentPage().getSimplePageMaster().getRegion(Constants.FO_REGION_BODY);
+            return rb.getColumnCount() == 1;
+        }
+        return false;
+    }
+
     /**
      * Returns {@code true} if the given position or one of its descendants
      * corresponds to a non-restartable LM.