Author: adelmelle
Date: Sun Jan 9 01:26:33 2011
New Revision: 1056861
URL: http://svn.apache.org/viewvc?rev=1056861&view=rev
Log:
Commit changes forgotten in r757256...
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=1056861&r1=1056860&r2=1056861&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Sun Jan 9 01:26:33 2011
@@ -25,7 +25,7 @@ import java.awt.Rectangle;
// FOP
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.datatypes.LengthBase;
-import org.apache.fop.datatypes.SimplePercentBaseContext;
+import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.fo.FONode;
/**
@@ -53,25 +53,9 @@ public class RegionBefore extends Region
/* Special rules apply to resolving extent as values are resolved
relative
* to the page size and reference orientation.
*/
- SimplePercentBaseContext pageWidthContext;
- SimplePercentBaseContext pageHeightContext;
- if (spm.getReferenceOrientation() % 180 == 0) {
- pageWidthContext = new SimplePercentBaseContext(null,
-
LengthBase.CUSTOM_BASE,
-
spm.getPageWidth().getValue());
- pageHeightContext = new SimplePercentBaseContext(null,
-
LengthBase.CUSTOM_BASE,
-
spm.getPageHeight().getValue());
- } else {
- // invert width and height since top left are rotated by 90 (cl or
ccl)
- pageWidthContext = new SimplePercentBaseContext(null,
-
LengthBase.CUSTOM_BASE,
-
spm.getPageHeight().getValue());
- pageHeightContext = new SimplePercentBaseContext(null,
-
LengthBase.CUSTOM_BASE,
-
spm.getPageWidth().getValue());
- }
- SimplePercentBaseContext neighbourContext;
+ PercentBaseContext pageWidthContext =
getPageWidthContext(LengthBase.CUSTOM_BASE);
+ PercentBaseContext pageHeightContext =
getPageHeightContext(LengthBase.CUSTOM_BASE);
+ PercentBaseContext neighbourContext;
Rectangle vpRect;
if (spm.getWritingMode() == EN_LR_TB || spm.getWritingMode() ==
EN_RL_TB) {
neighbourContext = pageWidthContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
