Simplify the calculation of the viewport. Now that indents are

calculated correctly, we can just use them without doing any lookup
of absolute margins.

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

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index 8b7dad5eacbac8c7602b8dbc2cf3271afd088773..8eeadcc812c030861705380f5962f1b0fcb5a26d 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -25,11 +25,7 @@ import java.awt.Rectangle;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.FOPropertyMapping;
 
 /**
  * The fo:region-body element.
@@ -57,36 +53,9 @@ public class RegionBody extends Region {
         * set but indent is explicitly set, it will return that.
         */
         CommonMarginBlock mProps = propMgr.getMarginProps();
-        int start = getRelMargin(PropertyList.START, PR_START_INDENT);
-        Rectangle vpRect;
-        if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
-            vpRect = new Rectangle(start, mProps.spaceBefore,
-                    reldims.ipd - start
-                        - getRelMargin(PropertyList.END, PR_END_INDENT),
+        return new Rectangle(mProps.startIndent, mProps.spaceBefore,
+                    reldims.ipd - mProps.startIndent - mProps.endIndent,
                     reldims.bpd - mProps.spaceBefore - mProps.spaceAfter);
-        } else {
-            vpRect = new Rectangle(start, mProps.spaceBefore,
-                    reldims.bpd - mProps.spaceBefore - mProps.spaceAfter,
-                    reldims.ipd - start
-                        - getRelMargin(PropertyList.END, PR_END_INDENT));
-        }
-        return vpRect;
-    }
-
-    /**
-     * Get the relative margin using parent's writing mode, not own
-     * writing mode.
-     */
-    private int getRelMargin(int reldir, int relPropId) {
-        FObj parent = (FObj) getParent();
-        String sPropName = "margin-"
-                + parent.getPropertyList().getAbsoluteWritingMode(reldir);
-        int propId = FOPropertyMapping.getPropertyId(sPropName);
-        Property prop = propertyList.getExplicitOrShorthand(propId);
-        if (prop == null) {
-            prop = propertyList.getExplicitOrShorthand(relPropId);
-        }
-        return ((prop != null) ? prop.getLength().getValue() : 0);
     }
 
     /**