diff options
Diffstat (limited to 'src/java/org/apache/fop/fo')
| -rw-r--r-- | src/java/org/apache/fop/fo/PropertyList.java | 14 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Leader.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/PageNumber.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/pagination/RegionBody.java | 11 |
4 files changed, 16 insertions, 13 deletions
diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 9b32a40f4..29299be67 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/src/java/org/apache/fop/fo/PropertyList.java @@ -488,7 +488,7 @@ abstract public class PropertyList { * @return a HyphenationProps object */ public CommonHyphenation getHyphenationProps() { - return new CommonHyphenation(); + return new CommonHyphenation(this); } /** @@ -496,7 +496,7 @@ abstract public class PropertyList { * @return a MarginProps object */ public CommonMarginBlock getMarginBlockProps() { - return new CommonMarginBlock(); + return new CommonMarginBlock(this); } /** @@ -504,7 +504,7 @@ abstract public class PropertyList { * @return a MarginInlineProps object */ public CommonMarginInline getMarginInlineProps() { - return new CommonMarginInline(); + return new CommonMarginInline(this); } /** @@ -512,7 +512,7 @@ abstract public class PropertyList { * @return a AccessibilityProps object */ public CommonAccessibility getAccessibilityProps() { - return new CommonAccessibility(); + return new CommonAccessibility(this); } /** @@ -520,7 +520,7 @@ abstract public class PropertyList { * @return a AuralProps object */ public CommonAural getAuralProps() { - CommonAural props = new CommonAural(); + CommonAural props = new CommonAural(this); return props; } @@ -529,7 +529,7 @@ abstract public class PropertyList { * @return a RelativePositionProps object */ public CommonRelativePosition getRelativePositionProps() { - return new CommonRelativePosition(); + return new CommonRelativePosition(this); } /** @@ -537,7 +537,7 @@ abstract public class PropertyList { * @return a AbsolutePositionProps object */ public CommonAbsolutePosition getAbsolutePositionProps() { - return new CommonAbsolutePosition(); + return new CommonAbsolutePosition(this); } diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 87cd555ec..c6cdf15b6 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -160,7 +160,7 @@ public class Leader extends FObjMixed { } public Font getFontState() { - return propMgr.getFontState(getFOEventHandler().getFontInfo()); + return commonFont.getFontState(getFOEventHandler().getFontInfo()); } public int getPatternWidth() { diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index a48e65e20..7b9d86bb5 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -137,7 +137,7 @@ public class PageNumber extends FObj { * @return the FontState object for this PageNumber */ public Font getFontState() { - return propMgr.getFontState(getFOEventHandler().getFontInfo()); + return commonFont.getFontState(getFOEventHandler().getFontInfo()); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index 4b732fb67..483c28b0c 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -94,10 +94,13 @@ public class RegionBody extends Region { * writing-mode on the page (not on the region-body!). If that's not * set but indent is explicitly set, it will return that. */ - CommonMarginBlock mProps = propMgr.getMarginProps(); - return new Rectangle(mProps.startIndent, mProps.spaceBefore, - reldims.ipd - mProps.startIndent - mProps.endIndent, - reldims.bpd - mProps.spaceBefore - mProps.spaceAfter); + int start = commonMarginBlock.startIndent.getValue(); + int end = commonMarginBlock.endIndent.getValue(); + int before = commonMarginBlock.spaceBefore.getOptimum().getLength().getValue(); + int after = commonMarginBlock.spaceAfter.getOptimum().getLength().getValue(); + return new Rectangle(start, before, + reldims.ipd - start - end, + reldims.bpd - before - after); } /** |