diff options
| author | Mehdi Houshmand <mehdi@apache.org> | 2012-06-20 13:31:51 +0000 |
|---|---|---|
| committer | Mehdi Houshmand <mehdi@apache.org> | 2012-06-20 13:31:51 +0000 |
| commit | d32664f71c991d0d9fd4445d3fc1b5e83bb0a963 (patch) | |
| tree | 4c97c07c0dbf5291f2ffb9f3e3cfe550c7dca180 /src/java/org/apache/fop/fo/properties | |
| parent | 04c08fb9042bbc6d8183ba2787750c353c958c66 (diff) | |
| parent | da4e308bb1bc707814227c29d769f47da0bb3fb2 (diff) | |
| download | xmlgraphics-fop-d32664f71c991d0d9fd4445d3fc1b5e83bb0a963.tar.gz xmlgraphics-fop-d32664f71c991d0d9fd4445d3fc1b5e83bb0a963.zip | |
Merged with trunk@1351540
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_URI_Unification@1352095 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/properties')
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/CondLengthProperty.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java index 07eec7361..19c8af1bb 100644 --- a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java @@ -26,6 +26,7 @@ import org.apache.fop.fo.Constants; import org.apache.fop.fo.FObj; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.util.CompareUtil; /** * Superclass for properties that have conditional lengths @@ -192,8 +193,8 @@ public class CondLengthProperty extends Property implements CompoundDatatype { if (obj instanceof CondLengthProperty) { CondLengthProperty clp = (CondLengthProperty)obj; - return (this.length == clp.length - && this.conditionality == clp.conditionality); + return (CompareUtil.equal(this.length, clp.length) + && CompareUtil.equal(this.conditionality, clp.conditionality)); } return false; } |