jeremias 2005/01/28 06:26:45
Modified: src/java/org/apache/fop/fo/properties PropertyMaker.java
Log:
corresponding.compute() may also return null to indicate that the inherited
value should be used.
Revision Changes Path
1.13 +7 -7
xml-fop/src/java/org/apache/fop/fo/properties/PropertyMaker.java
Index: PropertyMaker.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/PropertyMaker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PropertyMaker.java 12 Jan 2005 11:36:30 -0000 1.12
+++ PropertyMaker.java 28 Jan 2005 14:26:44 -0000 1.13
@@ -255,12 +255,12 @@
if (p == null) { // check for shorthand specification
p = getShorthand(propertyList);
}
- if (p == null && bTryInherit) {
- // else inherit (if has parent and is inheritable)
- PropertyList parentPropertyList =
propertyList.getParentPropertyList();
- if (parentPropertyList != null && isInherited()) {
- p = parentPropertyList.get(propId, true, false);
- }
+ }
+ if (p == null && bTryInherit) {
+ // else inherit (if has parent and is inheritable)
+ PropertyList parentPropertyList =
propertyList.getParentPropertyList();
+ if (parentPropertyList != null && isInherited()) {
+ p = parentPropertyList.get(propId, true, false);
}
}
return p;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
