revert some changes, dependent on other local changes, which would cause a compile error...

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

1 files changed, 7 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index 597032848..9c05d2ee7 100644
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -83,11 +83,14 @@ public class FlowLayoutManager extends BlockStackingLayoutManager
             int span = EN_NONE;
             int disableColumnBalancing = EN_FALSE;
             if (curLM instanceof BlockLayoutManager) {
-                span = ((BlockLayoutManager)curLM).getSpan();
-                disableColumnBalancing = ((BlockLayoutManager) curLM).getDisableColumnBalancing();
+                span = ((BlockLayoutManager)curLM).getBlockFO().getSpan();
+                disableColumnBalancing = ((BlockLayoutManager) curLM).getBlockContainerFO()
+                        .getDisableColumnBalancing();
             } else if (curLM instanceof BlockContainerLayoutManager) {
-                span = ((BlockContainerLayoutManager)curLM).getSpan();
-                disableColumnBalancing = ((BlockContainerLayoutManager) curLM).getDisableColumnBalancing();
+                span = ((BlockContainerLayoutManager)curLM).getBlockFO()
+                        .getSpan();
+                disableColumnBalancing = ((BlockContainerLayoutManager) curLM).getBlockContainerFO()
+                        .getDisableColumnBalancing();
             }
 
             int currentSpan = context.getCurrentSpan();