gmazza 2004/08/29 06:34:06 Modified: src/java/org/apache/fop/fo/pagination RegionBA.java RegionSE.java Log: Minor edits to adjustIPD() methods. Revision Changes Path 1.15 +5 -5 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java Index: RegionBA.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- RegionBA.java 4 Aug 2004 22:50:58 -0000 1.14 +++ RegionBA.java 29 Aug 2004 13:34:06 -0000 1.15 @@ -64,15 +64,15 @@ * 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 @@ } 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; } } } 1.10 +5 -5 xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java Index: RegionSE.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- RegionSE.java 4 Aug 2004 22:50:58 -0000 1.9 +++ RegionSE.java 29 Aug 2004 13:34:06 -0000 1.10 @@ -53,15 +53,15 @@ * 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 @@ } 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; } } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]