pietsch 2002/07/27 03:50:19 Modified: src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain PageSequence.java Log: Check whether there is a flow in a page sequence. Revision Changes Path No revision No revision 1.39.2.7 +7 -4 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java Index: PageSequence.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v retrieving revision 1.39.2.6 retrieving revision 1.39.2.7 diff -u -r1.39.2.6 -r1.39.2.7 --- PageSequence.java 24 Jul 2002 02:39:44 -0000 1.39.2.6 +++ PageSequence.java 27 Jul 2002 10:50:18 -0000 1.39.2.7 @@ -202,6 +202,9 @@ * Runs the formatting of this page sequence into the given area tree */ public void format(AreaTree areaTree) throws FOPException { + if (flow == null) { + throw new FOPException("No flow in page-sequence"); + } PageSequence previousPageSequence=this.root.getPageSequence(); if( previousPageSequence!=null ) { if (previousPageSequence.forcePageCountType == ForcePageCount.AUTO) { @@ -310,11 +313,11 @@ * @return a Page layout object based on the page master selected from the params */ private Page makePage(AreaTree areaTree, - boolean isBlankPage, - Page currentPage) + boolean isBlankPage, + Page currentPage) throws FOPException { if (this.pageSequenceMaster!=null) { - this.currentSimplePageMaster=this.pageSequenceMaster + this.currentSimplePageMaster = this.pageSequenceMaster .getNextSimplePageMaster(((this.currentPageNumber % 2)==1), isBlankPage); Region region = currentSimplePageMaster
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]