Fix for logic error causing array index exceptions

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

diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
index 1d436d085e743856b950aa5dce6aa186320187ce..8e260dc5ae8ac5873a23cdc2e8147970f59991e6 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
@@ -80,10 +80,16 @@ public class ColumnSetup {
         }
     }
 
+    /**
+     * Returns a column. If the index of the column is bigger than the number of explicitly
+     * defined columns the last column is returned.
+     * @param index index of the column (1 is the first column)
+     * @return the requested column
+     */
     public TableColumn getColumn(int index) {
         int size = columns.size();
-        if (index > size - 1) {
-            maxColIndexReferenced = index;
+        if (index > size) {
+            maxColIndexReferenced = Math.max(maxColIndexReferenced, index);
             return (TableColumn)columns.get(size - 1);
         } else {
             return (TableColumn)columns.get(index - 1);