Code clean-up only.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198431 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
index cad9c2e7adb98afe49835db70506392c6784ff33..5a338d3eefdb104c4ee530d0ff7d3adb9a1b2b93 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
@@ -79,23 +79,16 @@ public class IndentPropertyMaker extends CorrespondingPropertyMaker {
         
         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 @@ public class IndentPropertyMaker extends CorrespondingPropertyMaker {
         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);