klease      01/11/09 14:11:14

  Modified:    src/org/apache/fop/fo/flow StaticContent.java
  Log:
  Comment out all layout code for now
  
  Revision  Changes    Path
  1.21      +45 -45    xml-fop/src/org/apache/fop/fo/flow/StaticContent.java
  
  Index: StaticContent.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/StaticContent.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StaticContent.java        2001/11/09 11:32:38     1.20
  +++ StaticContent.java        2001/11/09 22:11:14     1.21
  @@ -1,5 +1,5 @@
   /*
  - * $Id: StaticContent.java,v 1.20 2001/11/09 11:32:38 keiron Exp $
  + * $Id: StaticContent.java,v 1.21 2001/11/09 22:11:14 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.
  @@ -31,50 +31,50 @@
   
       public Status layout(Area area, Region region) throws FOPException {
   
  -        int numChildren = this.children.size();
  -        // Set area absolute height so that link rectangles will be drawn correctly 
in xsl-before and xsl-after
  -        String regionClass = "none";
  -        if (region != null) {
  -            regionClass = region.getRegionClass();
  -        } else {
  -            if (getFlowName().equals("xsl-region-before")) {
  -                regionClass = RegionBefore.REGION_CLASS;
  -            } else if (getFlowName().equals("xsl-region-after")) {
  -                regionClass = RegionAfter.REGION_CLASS;
  -            } else if (getFlowName().equals("xsl-region-start")) {
  -                regionClass = RegionStart.REGION_CLASS;
  -            } else if (getFlowName().equals("xsl-region-end")) {
  -                regionClass = RegionEnd.REGION_CLASS;
  -            }
  -
  -        }
  -
  -        if (area instanceof org.apache.fop.layout.AreaContainer)
  -            ((org.apache.fop.layout.AreaContainer)area).setAreaName(regionClass);
  -
  -        if (regionClass.equals(RegionBefore.REGION_CLASS)) {
  -            area.setAbsoluteHeight(-area.getMaxHeight());
  -        } else if (regionClass.equals(RegionAfter.REGION_CLASS)) {
  -            area.setAbsoluteHeight(area.getPage().getBody().getMaxHeight());
  -        }
  -     setContentWidth(area.getContentWidth());
  -
  -        for (int i = 0; i < numChildren; i++) {
  -            FObj fo = (FObj)children.elementAt(i);
  -
  -            Status status;
  -            if ((status = fo.layout(area)).isIncomplete()) {
  -                // in fact all should be laid out and clip, error etc depending on 
'overflow'
  -                log.warn("Some static content could not fit in the area.");
  -                this.marker = i;
  -                if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) {
  -                    status = new Status(Status.AREA_FULL_SOME);
  -                }
  -                return (status);
  -            }
  -        }
  -        resetMarker();
  -        return new Status(Status.OK);
  +//         int numChildren = this.children.size();
  +//         // Set area absolute height so that link rectangles will be drawn 
correctly in xsl-before and xsl-after
  +//         String regionClass = "none";
  +//         if (region != null) {
  +//             regionClass = region.getRegionClass();
  +//         } else {
  +//             if (getFlowName().equals("xsl-region-before")) {
  +//                 regionClass = RegionBefore.REGION_CLASS;
  +//             } else if (getFlowName().equals("xsl-region-after")) {
  +//                 regionClass = RegionAfter.REGION_CLASS;
  +//             } else if (getFlowName().equals("xsl-region-start")) {
  +//                 regionClass = RegionStart.REGION_CLASS;
  +//             } else if (getFlowName().equals("xsl-region-end")) {
  +//                 regionClass = RegionEnd.REGION_CLASS;
  +//             }
  +
  +//         }
  +
  +//         if (area instanceof org.apache.fop.layout.AreaContainer)
  +//             ((org.apache.fop.layout.AreaContainer)area).setAreaName(regionClass);
  +
  +//         if (regionClass.equals(RegionBefore.REGION_CLASS)) {
  +//             area.setAbsoluteHeight(-area.getMaxHeight());
  +//         } else if (regionClass.equals(RegionAfter.REGION_CLASS)) {
  +//             area.setAbsoluteHeight(area.getPage().getBody().getMaxHeight());
  +//         }
  +//   setContentWidth(area.getContentWidth());
  +
  +//         for (int i = 0; i < numChildren; i++) {
  +//             FObj fo = (FObj)children.elementAt(i);
  +
  +//             Status status;
  +//             if ((status = fo.layout(area)).isIncomplete()) {
  +//                 // in fact all should be laid out and clip, error etc depending 
on 'overflow'
  +//                 log.warn("Some static content could not fit in the area.");
  +//                 this.marker = i;
  +//                 if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) {
  +//                     status = new Status(Status.AREA_FULL_SOME);
  +//                 }
  +//                 return (status);
  +//             }
  +//         }
  +//         resetMarker();
  +         return new Status(Status.OK);
       }
   
       protected String getElementName() {
  
  
  

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

Reply via email to