FOP-2957: Don't change ipd on lastpage if column count changes

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1880106 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 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 d6575e5f9..b1babb12a 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
@@ -68,6 +68,7 @@ public class PageBreaker extends AbstractBreaker {
     private MinOptMax relayedFootnoteSeparatorLength;
     private int previousFootnoteListIndex = -2;
     private int previousFootnoteElementIndex = -2;
+    private int prevousColumnCount;
 
     /**
      * The FlowLayoutManager object, which processes
@@ -712,8 +713,10 @@ public class PageBreaker extends AbstractBreaker {
         boolean onlyPageMasterDefined = pslm.getPageSequence().hasPagePositionOnly();
         if (lastPageMasterDefined && !onlyPageMasterDefined) {
             // code not very robust and unable to handle situations were only and last are defined
-            if (pageProvider.getCurrentColumnCount() > 1
-                    && optimalPageCount % pageProvider.getCurrentColumnCount() == 0) {
+            int currentColumnCount = pageProvider.getCurrentColumnCount();
+            boolean changeInColumnCount = prevousColumnCount > 0 && prevousColumnCount != currentColumnCount;
+            prevousColumnCount = currentColumnCount;
+            if ((currentColumnCount > 1 && optimalPageCount % currentColumnCount == 0) || changeInColumnCount) {
                 return false;
             }
             int currentIPD = this.pageProvider.getCurrentIPD();