keiron 2002/12/23 02:54:52
Modified: src/org/apache/fop/layoutmgr/table TableLayoutManager.java
Body.java
Log:
ignore tables without columns for now
Revision Changes Path
1.8 +3 -1
xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableLayoutManager.java 29 Nov 2002 23:18:56 -0000 1.7
+++ TableLayoutManager.java 23 Dec 2002 10:54:52 -0000 1.8
@@ -117,6 +117,7 @@
MinOptMax headerSize = null;
if (tableHeader != null) {
+ tableHeader.setUserAgent(getUserAgent());
tableHeader.resetPosition(null);
headerBreak = getHeight(tableHeader, context);
headerSize = headerBreak.getStackingSize();
@@ -125,6 +126,7 @@
MinOptMax footerSize = null;
if (tableFooter != null) {
+ tableFooter.setUserAgent(getUserAgent());
tableFooter.resetPosition(null);
footerBreak = getHeight(tableFooter, context);
footerSize = footerBreak.getStackingSize();
1.8 +7 -1 xml-fop/src/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Body.java 18 Nov 2002 15:54:15 -0000 1.7
+++ Body.java 23 Dec 2002 10:54:52 -0000 1.8
@@ -86,6 +86,12 @@
MinOptMax stackSize = new MinOptMax();
BreakPoss lastPos = null;
+ if (columns == null) {
+ setFinished(true);
+ getLogger().warn("ignoring table body with undefined columns");
+ return null;
+ }
+
while ((curLM = (Row)getChildLM()) != null) {
// Make break positions
// Set up a LayoutContext
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
