FOP-3249: Wrong last page for multicolumn layout

Author: simonsteiner1984

fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java

@@ -475,12 +475,12 @@ private void redoLayout(PageBreakingAlgorithm alg, int partCount,
                 //Replace last page
                 pslm.setCurrentPage(pageProvider.getPage(false, currentPageNum));
             } else {
+                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) {
                     //...and add a blank last page
-                    setLastPageIndex(currentPageNum + 1);
                     pslm.setCurrentPage(pslm.makeNewPage(true));
                 }
                 return;