Avoid an IndexOutOfBoundsException when more columns are used than are specified even though this is illegal with fixed table layout.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
index b7f29a744..eb91f7175 100644
--- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
@@ -221,8 +221,14 @@ public class ColumnSetup {
     public int getXOffset(int col, PercentBaseContext context) {
         int xoffset = 0;
         for (int i = col; --i >= 0;) {
-            if (colWidths.get(i) != null) {
-                xoffset += ((Length) colWidths.get(i)).getValue(context);
+            int effCol;
+            if (i < colWidths.size()) {
+                effCol = i;
+            } else {
+                effCol = colWidths.size() - 1;
+            }
+            if (colWidths.get(effCol) != null) {
+                xoffset += ((Length) colWidths.get(effCol)).getValue(context);
             }
         }
         return xoffset;