jeremias 2005/01/25 04:29:57
Modified: src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java TraitSetter.java
BlockLayoutManager.java
Log:
Removed unnecessary parameter
Revision Changes Path
1.33 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- BlockContainerLayoutManager.java 24 Jan 2005 09:16:45 -0000 1.32
+++ BlockContainerLayoutManager.java 25 Jan 2005 12:29:57 -0000 1.33
@@ -481,7 +481,7 @@
TraitSetter.addBorders(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
TraitSetter.addBackground(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
- TraitSetter.addMargins(viewportBlockArea, null,
+ TraitSetter.addMargins(viewportBlockArea,
fobj.getCommonBorderPaddingBackground(),
fobj.getCommonMarginBlock());
1.15 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Index: TraitSetter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TraitSetter.java 25 Jan 2005 10:55:47 -0000 1.14
+++ TraitSetter.java 25 Jan 2005 12:29:57 -0000 1.15
@@ -226,7 +226,7 @@
* @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();
1.38 +2 -2
xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- BlockLayoutManager.java 17 Jan 2005 18:59:50 -0000 1.37
+++ BlockLayoutManager.java 25 Jan 2005 12:29:57 -0000 1.38
@@ -336,14 +336,14 @@
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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
