aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/expr
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2007-01-11 21:03:07 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2007-01-11 21:03:07 +0000
commitaa8a93a60863373363fa7f02c11320b91fa688d4 (patch)
tree4e1f5515d1f918c669993405b26555a4d6eceb13 /src/java/org/apache/fop/fo/expr
parentb5c2cad08dc202898aae3be257a0c7ff6afcf0bb (diff)
downloadxmlgraphics-fop-aa8a93a60863373363fa7f02c11320b91fa688d4.tar.gz
xmlgraphics-fop-aa8a93a60863373363fa7f02c11320b91fa688d4.zip
Code cleanup:
- avoid unnecessary calls to getLogger(); LengthBase gets its own logger, LMs log to the AbstractLM logger - CommonBorderPaddingBackground no longer implements Cloneable (changes suggested by Richard Wheeldon) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@495371 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/expr')
-rw-r--r--src/java/org/apache/fop/fo/expr/LabelEndFunction.java2
-rw-r--r--src/java/org/apache/fop/fo/expr/PropertyInfo.java6
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);
}
/**