bckfnn 2004/09/22 12:21:10
Modified: src/java/org/apache/fop/fo PropertyManager.java
Log:
Removed hack that wrongly tried to calculate [start|end]-indent values.
Revision Changes Path
1.36 +5 -34 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PropertyManager.java 7 Sep 2004 20:47:09 -0000 1.35
+++ PropertyManager.java 22 Sep 2004 19:21:10 -0000 1.36
@@ -274,40 +274,11 @@
props.spaceAfter = this.propertyList.get(PR_SPACE_AFTER).
getSpace().getOptimum().getLength().getValue();
-
- // For now we do the section 5.3.2 calculation here.
- // This is a hack that doesn't deal correctly with:
- // - Reference vs. non-reference areas.
- // - writing mode, it mixes start and left.
- // - inherited values of margins and indents.
- // When the indents properties calculate this values correctly,
- // the block below can be removed and replaced with simple
- // props.startIndent = this.propertyList.get(PR_START_INDENT)
- // props.endIndent = this.propertyList.get(PR_END_INDENT)
- CommonBorderAndPadding bpProps = getBorderAndPadding();
-
- int startIndent = 0;
- if (props.marginLeft != 0) {
- startIndent = props.marginLeft;
- } else {
- startIndent = this.propertyList.get(PR_START_INDENT).
- getLength().getValue();
- }
- props.startIndent = startIndent +
- bpProps.getBorderStartWidth(false) +
- bpProps.getPaddingStart(false);
-
- int endIndent = 0;
- if (props.marginRight != 0) {
- endIndent = props.marginRight;
- } else {
- endIndent = this.propertyList.get(PR_END_INDENT).
- getLength().getValue();
- }
- props.endIndent = endIndent +
- bpProps.getBorderEndWidth(false) +
- bpProps.getPaddingEnd(false);
-
+ props.startIndent = this.propertyList.get(PR_START_INDENT).
+ getLength().getValue();
+ props.endIndent = this.propertyList.get(PR_END_INDENT).
+ getLength().getValue();
+
return props;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
