From: Andreas L. Delmelle Date: Wed, 7 Jun 2006 11:55:10 +0000 (+0000) Subject: See r412224: forgot to move the related code for TableColumn... X-Git-Tag: fop-0_93~194 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=822ebb71bcd3ac39943d2a27ec726a443bfc88ed;p=xmlgraphics-fop.git 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 6f2d7f198..164b0f796 100644 --- 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 227bc4e83..d66bff061 100644 --- 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); }