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 ar...@apache.org on 2001/05/10 02:52:59 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow Table.java
arved 01/05/09 17:52:59
Modified: src/org/apache/fop/fo/flow Table.java
Log:
G. Pretterhofer: added support for 'number-columns-repeated'
Revision Changes Path
1.30 +14 -12 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Table.java 2001/03/05 04:39:56 1.29
+++ Table.java 2001/05/10 00:52:58 1.30
@@ -1,4 +1,4 @@
-/*-- $Id: Table.java,v 1.29 2001/03/05 04:39:56 keiron Exp $ --
+/*-- $Id: Table.java,v 1.30 2001/05/10 00:52:58 arved Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -179,18 +179,20 @@
FONode fo = (FONode) children.elementAt(i);
if (fo instanceof TableColumn) {
TableColumn c = (TableColumn) fo;
- int num = c.getColumnNumber();
- if (num == 0) {
- num = currentColumnNumber + 1;
+ c.doSetup(areaContainer);
+ int numColumnsRepeated = c.getNumColumnsRepeated();
+ //int currentColumnNumber = c.getColumnNumber();
+
+ for (int j = 0; j < numColumnsRepeated; j++) {
+ currentColumnNumber++;
+ if (currentColumnNumber > columns.size()) {
+ columns.setSize(currentColumnNumber);
+ }
+ columns.setElementAt(c, currentColumnNumber - 1);
+ c.setColumnOffset(offset);
+ c.layout(areaContainer);
+ offset += c.getColumnWidth();
}
- currentColumnNumber = num;
- if (num > columns.size()) {
- columns.setSize(num);
- }
- columns.setElementAt(c, num - 1);
- c.setColumnOffset(offset);
- fo.layout(areaContainer);
- offset += c.getColumnWidth();
}
}
areaContainer.setAllocationWidth(offset);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org