2 files changed, 2 insertions, 41 deletions
diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index 3ae25fdd4..47327d26c 100644
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -88,7 +88,7 @@ public abstract class Region extends FObj {
     private String regionName;
 
     /** Holds the overflow attribute */
-    protected int overflow;
+    public int overflow;
     /** Holds the writing mode */
     protected int wm;
 
@@ -138,19 +138,6 @@ public abstract class Region extends FObj {
     public abstract Rectangle getViewportRectangle(FODimension pageRefRect);
 
     /**
-     * Create the region reference area for this region master.
-     * @param absRegVPRect The region viewport rectangle is "absolute" coordinates
-     * where x=distance from left, y=distance from bottom, width=right-left
-     * height=top-bottom
-     * @return a new region reference area
-     */
-    public RegionReference makeRegionReferenceArea(Rectangle2D absRegVPRect) {
-        RegionReference r = new RegionReference(getRegionAreaClass());
-        setRegionPosition(r, absRegVPRect);
-        return r;
-    }
-
-    /**
      * Set the region position inside the region viewport.
      * This sets the trasnform that is used to place the contents of
      * the region.
@@ -158,7 +145,7 @@ public abstract class Region extends FObj {
      * @param r the region reference area
      * @param absRegVPRect the rectangle to place the region contents
      */
-    protected void setRegionPosition(RegionReference r, Rectangle2D absRegVPRect) {
+    public void setRegionPosition(RegionReference r, Rectangle2D absRegVPRect) {
         FODimension reldims = new FODimension(0, 0);
         r.setCTM(CTM.getCTMandRelDims(propMgr.getAbsRefOrient(),
                 propMgr.getWritingMode(), absRegVPRect, reldims));
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index b03098b32..e717a3722 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -60,7 +60,6 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.Property;
-import org.apache.fop.fo.properties.Overflow;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
@@ -147,31 +146,6 @@ public class RegionBody extends Region {
     }
 
     /**
-     * Override the inherited method.
-     * @see org.apache.fop.fo.pagination.Region#makeRegionReferenceArea(Rectangle2D)
-     */
-    public RegionReference makeRegionReferenceArea(Rectangle2D absRegVPRect) {
-        // Should set some column stuff here I think, or put it elsewhere
-        BodyRegion body = new BodyRegion();
-        setRegionPosition(body, absRegVPRect);
-        int columnCount =
-                this.properties.get("column-count").getNumber().intValue();
-        if ((columnCount > 1) && (overflow == Overflow.SCROLL)) {
-            // recover by setting 'column-count' to 1. This is allowed but
-            // not required by the spec.
-            getLogger().error("Setting 'column-count' to 1 because "
-                    + "'overflow' is set to 'scroll'");
-            columnCount = 1;
-        }
-        body.setColumnCount(columnCount);
-
-        int columnGap =
-                this.properties.get("column-gap").getLength().getValue();
-        body.setColumnGap(columnGap);
-        return body;
-    }
-
-    /**
      * This is a hook for an FOTreeVisitor subclass to be able to access
      * this object.
      * @param fotv the FOTreeVisitor subclass that can access this object.