I didn't have time to do any fancy stuff. Feel free to improve. On 10.03.2008 13:17:53 Vincent Hennebert wrote: > Hi, > > > Author: jeremias > > Date: Mon Mar 10 03:06:37 2008 > > New Revision: 635508 > > > > URL: http://svn.apache.org/viewvc?rev=635508&view=rev > > Log: > > Fixed NPE in BlockContainerLayoutManager when used as a child of an > > inline-level FO. Split IP and BP stack limits in LayoutContext (there's now > > a certain amount of redundancy with "refIPD" in LayoutContext which I > > didn't resolve). > > Wouldn’t it make sense to re-use refIPD then? Or otherwise, add a TODO > to the set/getRefIPD methods and possibly deprecate them? So that at > least we know what should be used or not. > > > Areas are now generated for block-level FOs when used as children of > > inline-level FOs. > > ClassCastException in ListLayoutManager.mustKeepTogether() fixed (occured > > if used as child of an inline-level FO). > > <snip/> > > > Modified: > > xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java > > URL: > > http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=635508&r1=635507&r2=635508&view=diff > > ============================================================================== > > --- > > xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java > > (original) > > +++ > > xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java > > Mon Mar 10 03:06:37 2008 > > @@ -26,6 +26,7 @@ > > > > import org.apache.commons.logging.Log; > > import org.apache.commons.logging.LogFactory; > > + > > import org.apache.fop.area.Area; > > import org.apache.fop.area.LineArea; > > import org.apache.fop.area.Trait; > > @@ -583,7 +584,7 @@ > > // Set up constraints for inline level managers > > > > // IPD remaining in line > > - MinOptMax availIPD = context.getStackLimit(); > > + MinOptMax availIPD = context.getStackLimitIP(); > > This variable is used nowhere. Why not just remove it? > > > Vincent > > > -- > Vincent Hennebert Anyware Technologies > http://people.apache.org/~vhennebert http://www.anyware-tech.com > Apache FOP Committer FOP Development/Consulting
Jeremias Maerki
