Minor edits to adjustIPD() methods.

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

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java
index c78fc5d62662b4e9ef34d2b1f925fcb9fc76d81b..53d1b07452932de995cdbdbf0686c25a0b51575a 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java
@@ -64,15 +64,15 @@ public abstract class RegionBA extends Region {
      * If precedence is false on a before or after region, its
      * inline-progression-dimension is limited by the extent of the start
      * and end regions if they are present.
-     * @param vpRect viewport rectangle
+     * @param vpRefRect viewport reference rectangle
      * @param wm writing mode
      */
-    protected void adjustIPD(Rectangle vpRect, int wm) {
+    protected void adjustIPD(Rectangle vpRefRect, int wm) {
         int offset = 0;
         Region start = getSiblingRegion(Region.START);
         if (start != null) {
             offset = start.getExtent();
-            vpRect.translate(offset, 0);
+            vpRefRect.translate(offset, 0);
         }
         Region end = getSiblingRegion(Region.END);
         if (end != null) {
@@ -80,9 +80,9 @@ public abstract class RegionBA extends Region {
         }
         if (offset > 0) {
             if (wm == WritingMode.LR_TB || wm == WritingMode.RL_TB) {
-                vpRect.width -= offset;
+                vpRefRect.width -= offset;
             } else {
-                vpRect.height -= offset;
+                vpRefRect.height -= offset;
             }
         }
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java
index 454742dac8fe684652c6934041d4e7a2f4af4d27..5965602375e970d4d1848f667e768c325b55ce25 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionSE.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java
@@ -53,15 +53,15 @@ public abstract class RegionSE extends Region {
      * regions only go to the limits of their extents, otherwise
      * they extend in the BPD to the page reference rectangle
      * diminish by extend of start and end if present.
-     * @param refRect reference rectangle
+     * @param vpRefRect viewport reference rectangle
      * @param wm writing mode
      */
-    protected void adjustIPD(Rectangle refRect, int wm) {
+    protected void adjustIPD(Rectangle vpRefRect, int wm) {
         int offset = 0;
         Region before = getSiblingRegion(Region.BEFORE);
         if (before != null && before.getPrecedence()) {
             offset = before.getExtent();
-            refRect.translate(0, offset);
+            vpRefRect.translate(0, offset);
         }
         Region after = getSiblingRegion(Region.AFTER);
         if (after != null && after.getPrecedence()) {
@@ -69,9 +69,9 @@ public abstract class RegionSE extends Region {
         }
         if (offset > 0) {
             if (wm == WritingMode.LR_TB || wm == WritingMode.RL_TB) {
-                refRect.height -= offset;
+                vpRefRect.height -= offset;
             } else {
-                refRect.width -= offset;
+                vpRefRect.width -= offset;
             }
         }
     }