2 files changed, 16 insertions, 1 deletions
diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java
index 6cb9fac90..cb8335c4c 100644
--- a/src/org/apache/fop/fo/flow/Block.java
+++ b/src/org/apache/fop/fo/flow/Block.java
@@ -13,6 +13,8 @@ import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.LayoutManager;
+//import org.apache.fop.layoutmgr.BlockLayoutManager;
 
 import org.xml.sax.Attributes;
 
@@ -350,4 +352,9 @@ public class Block extends FObjMixed {
         return this.span;
     }
 
+    public LayoutManager getLayoutManager() {
+	//return new BlockLayoutManager(this);
+	return null;
+    }
+
 }
diff --git a/src/org/apache/fop/fo/flow/Flow.java b/src/org/apache/fop/fo/flow/Flow.java
index 869729cf9..2fb72bfae 100644
--- a/src/org/apache/fop/fo/flow/Flow.java
+++ b/src/org/apache/fop/fo/flow/Flow.java
@@ -14,6 +14,8 @@ import org.apache.fop.fo.pagination.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.BodyAreaContainer;
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.FlowLayoutManager;
 
 // Java
 import java.util.Hashtable;
@@ -70,6 +72,7 @@ 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 (this.name.equals("fo:flow")) {
                 throw new FOPException("Only a single fo:flow permitted"
@@ -81,7 +84,8 @@ public class Flow extends FObj {
         }
 */
         setFlowName(getProperty("flow-name").getString());
-        pageSequence.addFlow(this);
+	// Now done in addChild of page-sequence
+        //pageSequence.addFlow(this);
     }
 
     protected void setFlowName(String name) throws FOPException {
@@ -222,4 +226,8 @@ public class Flow extends FObj {
         return true;
     }
 
+    public LayoutManager getLayoutManager() {
+	return new FlowLayoutManager(this);
+    }
+
 }