aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2007-01-31 20:34:08 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2007-01-31 20:34:08 +0000
commit14e63efe0a40c52b353afdf7fbc046897b0683bf (patch)
tree1aaddb33c2c6d9aeacf1b105f01b989645768a19 /src
parent23ee8b822e45d72a349ce073c4690966fcd7d0eb (diff)
downloadxmlgraphics-fop-14e63efe0a40c52b353afdf7fbc046897b0683bf.tar.gz
xmlgraphics-fop-14e63efe0a40c52b353afdf7fbc046897b0683bf.zip
Fix for bugzilla 41503:
take into account that column-numbers need not be monotonically increasing git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@501977 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/fo/flow/TableFObj.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/TableFObj.java
index 65d32b76a..359530cdc 100644
--- a/src/java/org/apache/fop/fo/flow/TableFObj.java
+++ b/src/java/org/apache/fop/fo/flow/TableFObj.java
@@ -148,7 +148,8 @@ public abstract class TableFObj extends FObj {
TableRow row = (TableRow) this;
- for (i = colSpan; --i >= 0;) {
+ for (i = colSpan;
+ --i >= 0 || row.pendingSpans.size() < cell.getColumnNumber();) {
row.pendingSpans.add(null);
}