You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-dev@xmlgraphics.apache.org by James Tauber <jt...@locus.apache.org> on 1999/11/26 09:31:57 UTC

cvs commit: xml-fop/src/org/apache/fop/fo/flow TableCell.java TableRow.java

jtauber     99/11/26 00:31:57

  Modified:    .        STATUS
               src/org/apache/fop/fo/flow TableCell.java TableRow.java
  Log:
  table bug fixes from Eric Schaeffer. cells/rows were increasing the height of their parent area twice
  
  Revision  Changes    Path
  1.10      +3 -3      xml-fop/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/xml-fop/STATUS,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- STATUS	1999/11/25 19:21:09	1.9
  +++ STATUS	1999/11/26 08:31:57	1.10
  @@ -1,17 +1,17 @@
  -$Id: STATUS,v 1.9 1999/11/25 19:21:09 jtauber Exp $
  +$Id: STATUS,v 1.10 1999/11/26 08:31:57 jtauber Exp $
   
   STATUS
   
   Things to do before releasing as 0.12.0:
   
  -Make sure Makefiles work
  +[DONE] Make sure Makefiles work
   Get images working
   [PARTIAL] Incorporate Arved Sandstrom's simple-link implementation
   [DONE] Switch to using Status object as return from layout()
   [PARTIAL] Implement basic keeps
   [DONE]Incorporate Eric Schaeffer's fix to tables in static-content
   [DONE] Incorporate Kelly Campell's fixes to GifJpegImage
  -Incorporate Eric Schaeffer's further table fixes
  +[PARTIAL] Incorporate Eric Schaeffer's further table fixes
   Incorporate Eric Schaeffer's background colour implementation
   
   Other Bugs to fix:
  
  
  
  1.9       +4 -2      xml-fop/src/org/apache/fop/fo/flow/TableCell.java
  
  Index: TableCell.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TableCell.java	1999/11/25 17:55:29	1.8
  +++ TableCell.java	1999/11/26 08:31:57	1.9
  @@ -1,4 +1,4 @@
  -/*-- $Id: TableCell.java,v 1.8 1999/11/25 17:55:29 jtauber Exp $ -- 
  +/*-- $Id: TableCell.java,v 1.9 1999/11/26 08:31:57 jtauber Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -160,7 +160,9 @@
   		    return new Status(Status.AREA_FULL_SOME);
   		}
   	    }
  -	    height += blockArea.getHeight();
  +	    // bug fix from Eric Schaeffer
  +	    // height += blockArea.getHeight();
  +	    height = blockArea.getHeight();
   
   	}
   	blockArea.end();
  
  
  
  1.8       +3 -2      xml-fop/src/org/apache/fop/fo/flow/TableRow.java
  
  Index: TableRow.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TableRow.java	1999/11/25 17:33:13	1.7
  +++ TableRow.java	1999/11/26 08:31:57	1.8
  @@ -1,4 +1,4 @@
  -/*-- $Id: TableRow.java,v 1.7 1999/11/25 17:33:13 jtauber Exp $ -- 
  +/*-- $Id: TableRow.java,v 1.8 1999/11/26 08:31:57 jtauber Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -191,7 +191,8 @@
   	blockArea.end();
   	area.addChild(blockArea);
   	area.addDisplaySpace(largestCellHeight);
  -	area.increaseHeight(largestCellHeight);
  +	// bug fix from Eric Schaeffer
  +	//area.increaseHeight(largestCellHeight);
   
   	if (spaceAfter != 0) {
   	    area.addDisplaySpace(spaceAfter);