Removed unnecessary parameter

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

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index d6826a6944f09c032791dad0b066529cd5cf7e21..68517a1a480856e807270e19e3ca3f19b78f2c97 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -481,7 +481,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
 
             TraitSetter.addBorders(viewportBlockArea, fobj.getCommonBorderPaddingBackground());
             TraitSetter.addBackground(viewportBlockArea, fobj.getCommonBorderPaddingBackground());
-            TraitSetter.addMargins(viewportBlockArea, null, 
+            TraitSetter.addMargins(viewportBlockArea, 
                     fobj.getCommonBorderPaddingBackground(),
                     fobj.getCommonMarginBlock());
             

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 7d8c73d9e8292052006fed8d0c99ff0b7f4d5aed..e6949a164261a888f8890e370fc0a704cd9e4c88 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -336,14 +336,14 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
             curBlockArea = new Block();
 
             // Must get dimensions from parent area
-            Area parentArea = parentLM.getParentArea(curBlockArea);
+            //Area parentArea = parentLM.getParentArea(curBlockArea);
 
             // set traits
             TraitSetter.addBorders(curBlockArea, 
                     fobj.getCommonBorderPaddingBackground());
             TraitSetter.addBackground(curBlockArea, 
                     fobj.getCommonBorderPaddingBackground());
-            TraitSetter.addMargins(curBlockArea, parentArea,
+            TraitSetter.addMargins(curBlockArea,
                     fobj.getCommonBorderPaddingBackground(), 
                     fobj.getCommonMarginBlock());
             TraitSetter.addBreaks(curBlockArea, 

diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
index dd0abea60887bcf5a6339deae10a31eab00b6a1b..927da246bb038c32bb01a37ee37ffa81cd86c62c 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java
+++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
@@ -226,7 +226,7 @@ public class TraitSetter {
      * @param bpProps the border, padding and background properties
      * @param marginProps the margin properties.
      */
-    public static void addMargins(Area area, Area parentArea,
+    public static void addMargins(Area area,
                                   CommonBorderPaddingBackground bpProps,
                                   CommonMarginBlock marginProps) {
         int startIndent = marginProps.startIndent.getValue();