klease      01/10/14 13:42:04

  Modified:    src/org/apache/fop/fo/flow TableCell.java
  Log:
  Don't call layout() on children when doing layout() on a table-cell which is already 
completely laid out (case of split rows)
  
  Revision  Changes    Path
  1.39      +10 -3     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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- TableCell.java    2001/08/06 09:12:59     1.38
  +++ TableCell.java    2001/10/14 20:42:04     1.39
  @@ -1,5 +1,5 @@
   /*
  - * -- $Id: TableCell.java,v 1.38 2001/08/06 09:12:59 keiron Exp $ --
  + * -- $Id: TableCell.java,v 1.39 2001/10/14 20:42:04 klease Exp $ --
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -82,6 +82,11 @@
   
       // boolean setup = false;
       boolean bSepBorders = true;
  +    
  +    /**
  +     * Set to true if all content completely laid out.
  +     */
  +    boolean bDone=false;
   
       /**
        * Border separation value in the block-progression dimension.
  @@ -209,6 +214,7 @@
               area.getIDReferences().createID(id);
   
               this.marker = 0;
  +            this.bDone=false;
           }
   
           /*
  @@ -250,7 +256,7 @@
           cellArea.setTableCellXOffset(startOffset);
   
           int numChildren = this.children.size();
  -        for (int i = this.marker; i < numChildren; i++) {
  +        for (int i = this.marker; bDone==false && i < numChildren; i++) {
               FObj fo = (FObj)children.elementAt(i);
               fo.setIsInTableCell();
               fo.forceWidth(width);    // ???
  @@ -275,6 +281,7 @@
               area.setMaxHeight(area.getMaxHeight() - spaceLeft
                                 + this.cellArea.getMaxHeight());
           }
  +        this.bDone=true;
           cellArea.end();
           area.addChild(cellArea);
   
  @@ -457,6 +464,6 @@
               this.borderHeight = (borderBefore + borderAfter) / 2;
           }
       }
  -
  +    
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to