diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-01-25 12:29:57 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-01-25 12:29:57 +0000 |
| commit | d9ac7fb576b1bccf85d564f4f024ec9f117ae70a (patch) | |
| tree | 68639b7b814030e19503db3cba90d30e63f2c9aa | |
| parent | c62eb56cc396af640a5323b1198b940d2b8afdb0 (diff) | |
| download | xmlgraphics-fop-d9ac7fb576b1bccf85d564f4f024ec9f117ae70a.tar.gz xmlgraphics-fop-d9ac7fb576b1bccf85d564f4f024ec9f117ae70a.zip | |
Removed unnecessary parameter
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198315 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index d6826a694..68517a1a4 100644 --- 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 7d8c73d9e..e6949a164 100644 --- 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 dd0abea60..927da246b 100644 --- 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(); |