See r412224: forgot to move the related code for TableColumn...

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

diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 6f2d7f198c4f08fe51e641435b8f62145f5f5cf3..164b0f79601c1055c132be494766f838c3a7544d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -272,10 +272,6 @@ public class Table extends TableFObj {
                 columns.add(col);
             }
         }
-        //flag column indices used by this column
-        int startIndex = colNumber - 1;
-        int endIndex = startIndex + colRepeat;
-        flagColumnIndices(startIndex, endIndex);
     }
 
     /** @return true of table-layout="auto" */

diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index 227bc4e83d4f63e7ecf6d188beded5ffd3dec1a5..d66bff061f85586bc5e003ce4dd32a31ea4dd033 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -103,6 +103,10 @@ public class TableColumn extends TableFObj {
      * @see org.apache.fop.fo.FONode#endOfNode
      */
     protected void endOfNode() throws FOPException {
+        //flag column indices used by this column
+        int startIndex = getColumnNumber() - 1;
+        int endIndex = startIndex + getNumberColumnsRepeated();
+        getTable().flagColumnIndices(startIndex, endIndex);
         getFOEventHandler().endColumn(this);
     }