added Eric Schaeffer's fixes for when tables are in static-content

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193237 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 470d6669499f36538eb7b18b5454ff4882512a93..e12212087c36cb62752f50bfac0ab5f1fa8c6bbb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -9,7 +9,7 @@ Get images working
 [PARTIAL] Incorporate Arved Sandstrom's simple-link implementation
 Switch to using Status object as return from layout()
 Implement basic keeps
-Incorporate Eric Schaeffer's fix to tables in static-content
+[DONE]Incorporate Eric Schaeffer's fix to tables in static-content
 [DONE] Incorporate Kelly Campell's fixes to GifJpegImage
 
 Other Bugs to fix:

diff --git a/src/org/apache/fop/fo/flow/Table.java b/src/org/apache/fop/fo/flow/Table.java
index eff120aa5a937b617f2a0e985131bda374d86aa2..a41c938e668355abd251fd4d5d65b27de6ee74fe 100644 (file)
--- a/src/org/apache/fop/fo/flow/Table.java
+++ b/src/org/apache/fop/fo/flow/Table.java
@@ -22,7 +22,7 @@
     Alternately, this  acknowledgment may  appear in the software itself,  if
     and wherever such third-party acknowledgments normally appear.
  
- 4. The names "Fop" and  "Apache Software Foundation"  must not be used to
+ 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
     endorse  or promote  products derived  from this  software without  prior
     written permission. For written permission, please contact
     apache@apache.org.
@@ -153,6 +153,9 @@ public class Table extends FObj {
        blockArea.setPage(area.getPage());
        blockArea.start();
 
+       // added by Eric Shaeffer
+       currentColumnNumber = 0;
+
        int numChildren = this.children.size();
        for (int i = this.marker; i < numChildren; i++) {
            FONode fo = (FONode) children.elementAt(i);

diff --git a/src/org/apache/fop/fo/flow/TableCell.java b/src/org/apache/fop/fo/flow/TableCell.java
index 5abe8c57861eb35c636f356e49167528d36048b8..f3bc0c063376488d3ee4a8519ad24326fca10278 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableCell.java
+++ b/src/org/apache/fop/fo/flow/TableCell.java
@@ -22,7 +22,7 @@
     Alternately, this  acknowledgment may  appear in the software itself,  if
     and wherever such third-party acknowledgments normally appear.
  
- 4. The names "Fop" and  "Apache Software Foundation"  must not be used to
+ 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
     endorse  or promote  products derived  from this  software without  prior
     written permission. For written permission, please contact
     apache@apache.org.
@@ -142,6 +142,9 @@ public class TableCell extends FObj {
        blockArea.setPage(area.getPage());
        blockArea.start();
 
+       // added by Eric Shaeffer
+       height = 0;
+
        int numChildren = this.children.size();
        for (int i = this.marker; i < numChildren; i++) {
            FObj fo = (FObj) children.elementAt(i);

diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index 9578f0ea39dd79ff4b1933241220cf153e3cb069..8f4549345a1a800e4d02890d2741d90e593e1775 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -22,7 +22,7 @@
     Alternately, this  acknowledgment may  appear in the software itself,  if
     and wherever such third-party acknowledgments normally appear.
  
- 4. The names "Fop" and  "Apache Software Foundation"  must not be used to
+ 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
     endorse  or promote  products derived  from this  software without  prior
     written permission. For written permission, please contact
     apache@apache.org.
@@ -148,6 +148,10 @@ public class TableRow extends FObj {
            return OK;
        }
 
+       // added by Eric Schaeffer
+       widthOfCellsSoFar = 0;
+       largestCellHeight = 0;
+
        for (int i = this.marker; i < numChildren; i++) {
            TableCell cell = (TableCell) children.elementAt(i);