diff options
Diffstat (limited to 'src/java/org/apache/fop/fo/expr')
| -rw-r--r-- | src/java/org/apache/fop/fo/expr/LabelEndFunction.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/expr/PropertyInfo.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java index 39e5fafa2..8a02d21d6 100644 --- a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java +++ b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java @@ -66,7 +66,7 @@ public class LabelEndFunction extends FunctionBase { } Length startIndent = pList.get(Constants.PR_START_INDENT).getLength(); - LengthBase base = new LengthBase(pList.getFObj(), pInfo.getPropertyList(), + LengthBase base = new LengthBase(pInfo.getPropertyList(), LengthBase.CONTAINING_REFAREA_WIDTH); PercentLength refWidth = new PercentLength(1.0, base); diff --git a/src/java/org/apache/fop/fo/expr/PropertyInfo.java b/src/java/org/apache/fop/fo/expr/PropertyInfo.java index 08b95628c..dc104b465 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyInfo.java +++ b/src/java/org/apache/fop/fo/expr/PropertyInfo.java @@ -47,10 +47,10 @@ public class PropertyInfo { * @param plist PropertyList object * @param fo FObj */ - public PropertyInfo(PropertyMaker maker, PropertyList plist, FObj fo) { + public PropertyInfo(PropertyMaker maker, PropertyList plist) { this.maker = maker; this.plist = plist; - this.fo = fo; + this.fo = plist.getParentFObj(); } /** @@ -61,7 +61,7 @@ public class PropertyInfo { */ public PercentBase getPercentBase() throws PropertyException { PercentBase pcbase = getFunctionPercentBase(); - return (pcbase != null) ? pcbase : maker.getPercentBase(fo, plist); + return (pcbase != null) ? pcbase : maker.getPercentBase(plist); } /** |