Backtracked a bit with SCLM: switched to providing the Region FO

instead of the region-reference-area, the latter obtainable already
from getCurrentPV().

Switched to a tighter 3-param SCLM constructor, also new
convenience method in PV.


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

1 files changed, 3 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 7b1cd4e01..4983027cc 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -24,7 +24,6 @@ import org.apache.fop.area.AreaTreeHandler;
 import org.apache.fop.area.AreaTreeModel;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.LineArea;
-import org.apache.fop.area.RegionViewport;
 import org.apache.fop.area.Resolvable;
 
 import org.apache.fop.datatypes.PercentBase;
@@ -426,12 +425,9 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
             return;
         }
 
-        RegionViewport rv = curPV.getPage().getRegionViewport(regionID);
-        StaticContentLayoutManager lm;
-        lm = (StaticContentLayoutManager)
-            getLayoutManagerMaker().makeLayoutManager(sc);
-        lm.setTargetRegion(rv.getRegionReference());
-        lm.setParent(this);       
+        StaticContentLayoutManager lm = (StaticContentLayoutManager)
+            getLayoutManagerMaker().makeStaticContentLayoutManager(
+                    this, sc, reg);
         lm.doLayout();
         lm.reset(null);
     }