More cleanup/simplifications.

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

3 files changed, 5 insertions, 9 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index c11914962..bed7187bb 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -185,11 +185,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
         log.warn("null implementation of getWordChars() called!");
     }
 
-    // This version is not in LayoutManager but is the only version being
-    // called within the application.
-    public void getWordChars(StringBuffer sbChars, Position pos) {
-    }
-
     public void hyphenate(Position pos, HyphContext hc) {
         log.warn("null implementation of hyphenate called!");
     }
diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index bd3891cea..2a9fdae6c 100644
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -62,11 +62,12 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
     }
 
     /**
-     * Constructor using a fo:title formatting object
+     * Constructor using a fo:title formatting object and its
+     * PageSequenceLayoutManager parent.
      */
-    public ContentLayoutManager(Title foTitle, LayoutManager parentLM) {
+    public ContentLayoutManager(Title foTitle, PageSequenceLayoutManager pslm) {
         // get breaks then add areas to title
-        this.parentLM = parentLM;
+        this.parentLM = pslm;
         holder = new LineArea();
 
         setUserAgent(foTitle.getUserAgent());
diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 6418d82e7..8f94f504c 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -236,7 +236,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                 footnoteSeparatorLM.doLayout();
             }
 
-            getCurrentChildLM().addAreas(posIter, context);    
+            childFLM.addAreas(posIter, context);    
         }
         
         protected void doPhase3(PageBreakingAlgorithm alg, int partCount,