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

diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/TableFObj.java
index 65d32b76a63b05f10cf612190d22cf8638e35ea3..359530cdc946d82ba5d63f1c48b6a1dafce417bc 100644 (file)
--- 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);
             }
             

diff --git a/test/fotree/testcases/column-number_bug41503.fo b/test/fotree/testcases/column-number_bug41503.fo
new file mode 100644 (file)
index 0000000..cc7aedd
--- /dev/null
+++ b/test/fotree/testcases/column-number_bug41503.fo
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="content" page-width="210mm" page-height="297mm">
+      <fo:region-body/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="content">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:table table-layout="fixed" width="100%">
+        <fo:table-column column-width="proportional-column-width(1)"/>
+        <fo:table-column column-width="100mm"/>
+        <fo:table-column column-width="proportional-column-width(1)"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell border="1pt solid black" column-number="1">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>column 1</fo:block>
+            </fo:table-cell>           
+            <fo:table-cell border="1pt solid black" column-number="3" number-rows-spanned="2">
+              <test:assert property="column-number" expected="3" />
+              <fo:block>column 3</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell border="1pt solid black" column-number="1">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>column 1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell border="1pt solid black" column-number="2">
+              <test:assert property="column-number" expected="2" />
+              <fo:block>column 2</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+