From c784e62a58b9f33e56b19198c0cd03ab6a627903 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Thu, 28 Sep 2017 14:45:41 +0000 Subject: FOP-2744: Allow unmapped flow for repeatable-page-master git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1810008 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java | 3 ++- .../org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'fop-core') diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index 6b993424c..75bfe5e60 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -205,7 +205,8 @@ public class PageSequenceLayoutManager extends AbstractPageSequenceLayoutManager String psName = getPageSequence().getMainFlow().getFlowName(); Region body = newPage.getSimplePageMaster().getRegion(FO_REGION_BODY); String name = body.getRegionName(); - if (strict && !name.equals(psName) && !name.equals(((RegionBody)body).getDefaultRegionName())) { + if (strict && !name.equals(psName) && !name.equals(((RegionBody)body).getDefaultRegionName()) + && getPageSequence().hasPagePositionLast()) { throw new RuntimeException( "The flow-name \"" + name + "\" could not be mapped to a region-name in the layout-master-set"); } diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java index e6a0975a8..a87dc0fa0 100644 --- a/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java @@ -127,6 +127,7 @@ public class PageSequenceLayoutManagerTestCase { when(flow.getFlowName()).thenReturn(MAIN_FLOW_NAME); when(pseq.getRoot()).thenReturn(root); + when(pseq.hasPagePositionLast()).thenReturn(true); when(pseq.getMainFlow()).thenReturn(flow); PageSequenceLayoutManager pageSequenceLayoutManager = new PageSequenceLayoutManager(ath, pseq) { -- cgit v1.2.3