From bba642c9a3c47b1e607830b9a17c6a6518a2127c Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Wed, 22 Sep 2004 19:21:10 +0000 Subject: Removed hack that wrongly tried to calculate [start|end]-indent values. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197965 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/PropertyManager.java | 39 ++++--------------------- 1 file changed, 5 insertions(+), 34 deletions(-) (limited to 'src/java/org') diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index b01c3fa0d..b39fc42bc 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/src/java/org/apache/fop/fo/PropertyManager.java @@ -274,40 +274,11 @@ public class PropertyManager implements Constants { 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; } -- cgit v1.2.3