You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2007/01/31 21:34:08 UTC
svn commit: r501977 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/flow/TableFObj.java
test/fotree/testcases/column-number_bug41503.fo
Author: adelmelle
Date: Wed Jan 31 12:34:08 2007
New Revision: 501977
URL: http://svn.apache.org/viewvc?view=rev&rev=501977
Log:
Fix for bugzilla 41503:
take into account that column-numbers need not be monotonically increasing
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java?view=diff&rev=501977&r1=501976&r2=501977
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java Wed Jan 31 12:34:08 2007
@@ -148,7 +148,8 @@
TableRow row = (TableRow) this;
- for (i = colSpan; --i >= 0;) {
+ for (i = colSpan;
+ --i >= 0 || row.pendingSpans.size() < cell.getColumnNumber();) {
row.pendingSpans.add(null);
}
Added: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo?view=auto&rev=501977
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo Wed Jan 31 12:34:08 2007
@@ -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>
+
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_bug41503.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org