aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/org')
-rw-r--r--src/java/org/apache/fop/fo/pagination/Region.java16
-rw-r--r--src/java/org/apache/fop/layoutmgr/PageLayoutManager.java19
2 files changed, 17 insertions, 18 deletions
diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index 47327d26c..79a077a2c 100644
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -60,8 +60,6 @@ import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.area.CTM;
-import org.apache.fop.area.RegionReference;
// SAX
import org.xml.sax.Attributes;
@@ -138,20 +136,6 @@ public abstract class Region extends FObj {
public abstract Rectangle getViewportRectangle(FODimension pageRefRect);
/**
- * Set the region position inside the region viewport.
- * This sets the trasnform that is used to place the contents of
- * the region.
- *
- * @param r the region reference area
- * @param absRegVPRect the rectangle to place the region contents
- */
- public void setRegionPosition(RegionReference r, Rectangle2D absRegVPRect) {
- FODimension reldims = new FODimension(0, 0);
- r.setCTM(CTM.getCTMandRelDims(propMgr.getAbsRefOrient(),
- propMgr.getWritingMode(), absRegVPRect, reldims));
- }
-
- /**
* Return the enumerated value designating this type of region in the
* Area tree.
* @return the region area class
diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index c839ada34..a1825b965 100644
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -844,7 +844,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
Rectangle2D absRegVPRect) {
// Should set some column stuff here I think, or put it elsewhere
BodyRegion body = new BodyRegion();
- r.setRegionPosition(body, absRegVPRect);
+ setRegionPosition(r, body, absRegVPRect);
int columnCount =
r.properties.get("column-count").getNumber().intValue();
if ((columnCount > 1) && (r.overflow == Overflow.SCROLL)) {
@@ -872,8 +872,23 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
public RegionReference makeRegionReferenceArea(Region r,
Rectangle2D absRegVPRect) {
RegionReference rr = new RegionReference(r.getRegionAreaClass());
- r.setRegionPosition(rr, absRegVPRect);
+ setRegionPosition(r, rr, absRegVPRect);
return rr;
}
+ /**
+ * Set the region position inside the region viewport.
+ * This sets the trasnform that is used to place the contents of
+ * the region.
+ *
+ * @param r the region reference area
+ * @param absRegVPRect the rectangle to place the region contents
+ */
+ public void setRegionPosition(Region r, RegionReference rr,
+ Rectangle2D absRegVPRect) {
+ FODimension reldims = new FODimension(0, 0);
+ rr.setCTM(CTM.getCTMandRelDims(r.getPropertyManager().getAbsRefOrient(),
+ r.getPropertyManager().getWritingMode(), absRegVPRect, reldims));
+ }
+
}