Fixed bug reported by Cliff Harrison regarding order of static contents and

fo:flow object.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193975 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/flow/Flow.java b/src/org/apache/fop/fo/flow/Flow.java
index 8b86bfef7cf17dab36d3dc9b064ee3663c238c8d..429ba47beceab5d978234bf8f7cf754594ba272a 100644 (file)
--- a/src/org/apache/fop/fo/flow/Flow.java
+++ b/src/org/apache/fop/fo/flow/Flow.java
@@ -111,7 +111,8 @@ public class Flow extends FObj {
        // 001228, Number 406), confusion in spec section 6.4.5 about
        // multiplicity of fo:flow in XSL 1.0 is cleared up - one (1)
        // fo:flow per fo:page-sequence only.
-       if (!pageSequence.isFlowSet())
+       
+       if (!pageSequence.isFlowSet() || !(this.name.equals("fo:flow")))
                pageSequence.addFlow(this);
        else
                throw new FOPException("Only a single fo:flow permitted"