bckfnn 2004/09/22 01:25:16
Modified: src/java/org/apache/fop/layoutmgr/list Item.java
ListItemLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Cell.java
TableLayoutManager.java
Log:
Set content ipd/bpd instead of allocation width/height.
Revision Changes Path
1.8 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Item.java 26 May 2004 04:22:40 -0000 1.7
+++ Item.java 22 Sep 2004 08:25:16 -0000 1.8
@@ -216,7 +216,7 @@
curBlockArea.setPositioning(Block.ABSOLUTE);
// set position
curBlockArea.setXOffset(xoffset);
- curBlockArea.setWidth(itemIPD);
+ curBlockArea.setIPD(itemIPD);
//curBlockArea.setHeight();
// Set up dimensions
1.14 +1 -2
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ListItemLayoutManager.java 7 Sep 2004 20:47:11 -0000 1.13
+++ ListItemLayoutManager.java 22 Sep 2004 08:25:16 -0000 1.14
@@ -236,7 +236,7 @@
}
}
- curBlockArea.setHeight(listItemHeight);
+ curBlockArea.setBPD(listItemHeight);
flush();
@@ -274,7 +274,6 @@
Area parentArea = parentLM.getParentArea(curBlockArea);
int referenceIPD = parentArea.getIPD();
curBlockArea.setIPD(referenceIPD);
- curBlockArea.setWidth(referenceIPD);
// Get reference IPD from parentArea
setCurrentArea(curBlockArea); // ??? for generic operations
}
1.10 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cell.java 26 May 2004 04:22:40 -0000 1.9
+++ Cell.java 22 Sep 2004 08:25:16 -0000 1.10
@@ -211,7 +211,7 @@
TraitSetter.addBackground(curBlockArea, backgroundProps);
}
- curBlockArea.setHeight(height);
+ curBlockArea.setBPD(height);
flush();
@@ -239,13 +239,13 @@
// set position
curBlockArea.setXOffset(xoffset);
curBlockArea.setYOffset(yoffset);
- curBlockArea.setWidth(cellIPD);
+ curBlockArea.setIPD(cellIPD);
//curBlockArea.setHeight();
// Set up dimensions
Area parentArea = parentLM.getParentArea(curBlockArea);
int referenceIPD = parentArea.getIPD();
- curBlockArea.setIPD(referenceIPD);
+ //curBlockArea.setIPD(referenceIPD);
// Get reference IPD from parentArea
setCurrentArea(curBlockArea); // ??? for generic operations
}
1.13 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TableLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.12
+++ TableLayoutManager.java 22 Sep 2004 08:25:16 -0000 1.13
@@ -330,7 +330,7 @@
}
}
- curBlockArea.setHeight(tableHeight);
+ curBlockArea.setBPD(tableHeight);
if (borderProps != null) {
TraitSetter.addBorders(curBlockArea, borderProps);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
