jeremias 2005/02/15 22:46:15 Modified: src/java/org/apache/fop/fo/properties IndentPropertyMaker.java Log: Code clean-up only. Revision Changes Path 1.12 +6 -15 xml-fop/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java Index: IndentPropertyMaker.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- IndentPropertyMaker.java 17 Jan 2005 10:38:02 -0000 1.11 +++ IndentPropertyMaker.java 16 Feb 2005 06:46:15 -0000 1.12 @@ -79,23 +79,16 @@ int marginProp = pList.getWritingMode(lr_tb, rl_tb, tb_rl); Numeric margin; -// Calculate the absolute margin. + // Calculate the absolute margin. if (propertyList.getExplicitOrShorthand(marginProp) == null) { Property indent = propertyList.getExplicit(baseMaker.propId); if (indent == null) { //Neither start-indent nor margin is specified, use inherited - //margin = new FixedLength(0); - /* - Numeric v = new FixedLength(0); - v = NumericOp.addition(v, propertyList.getInherited(baseMaker.propId).getNumeric()); - return (Property)v; - */ return null; - } else { - margin = propertyList.getExplicit(baseMaker.propId).getNumeric(); - margin = NumericOp.subtraction(margin, - propertyList.getInherited(baseMaker.propId).getNumeric()); } + margin = propertyList.getExplicit(baseMaker.propId).getNumeric(); + margin = NumericOp.subtraction(margin, + propertyList.getInherited(baseMaker.propId).getNumeric()); margin = NumericOp.subtraction(margin, padding); margin = NumericOp.subtraction(margin, border); } else { @@ -105,9 +98,7 @@ Numeric v = new FixedLength(0); if (!propertyList.getFObj().generatesReferenceAreas()) { // The inherited_value_of([start|end]-indent) - //if (!propertyList.getParentFObj().generatesReferenceAreas()) { - v = NumericOp.addition(v, propertyList.getInherited(baseMaker.propId).getNumeric()); - //} + v = NumericOp.addition(v, propertyList.getInherited(baseMaker.propId).getNumeric()); } // The corresponding absolute margin-[right|left}. v = NumericOp.addition(v, margin);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]