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 7fc135b7dcc22532986d12b7586ff7bc4248d4bb..f50c95affb747784ebccc4fdd00891c0dc4284b2 100644 (file)
--- 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 d968ce23d92a1103488f334157ae9f6341017810..9797c29affba38e12de7a947178ddaf10d95889b 100644 (file)
--- 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();