From: Keiron Liddle <keiron@apache.org>
Date: Mon, 23 Dec 2002 10:54:52 +0000 (+0000)
Subject: ignore tables without columns for now
X-Git-Tag: Alt-Design-integration-base~222
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d2469c3000d3bb3a39cbdecccb175244c41f4c42;p=xmlgraphics-fop.git

ignore tables without columns for now


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

diff --git a/src/org/apache/fop/layoutmgr/table/Body.java b/src/org/apache/fop/layoutmgr/table/Body.java
index 7fc135b7d..f50c95aff 100644
--- a/src/org/apache/fop/layoutmgr/table/Body.java
+++ b/src/org/apache/fop/layoutmgr/table/Body.java
@@ -86,6 +86,12 @@ public class Body extends BlockStackingLayoutManager {
         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
diff --git a/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index d968ce23d..9797c29af 100644
--- a/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -117,6 +117,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
 
         MinOptMax headerSize = null;
         if (tableHeader != null) {
+            tableHeader.setUserAgent(getUserAgent());
             tableHeader.resetPosition(null);
             headerBreak = getHeight(tableHeader, context);
             headerSize = headerBreak.getStackingSize();
@@ -125,6 +126,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
 
         MinOptMax footerSize = null;
         if (tableFooter != null) {
+            tableFooter.setUserAgent(getUserAgent());
             tableFooter.resetPosition(null);
             footerBreak = getHeight(tableFooter, context);
             footerSize = footerBreak.getStackingSize();