FOP-3195: Skip written block ipds inside float

2 files changed, 2 insertions, 8 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
index a3edc2088..dba4723c9 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
@@ -209,14 +209,8 @@ public abstract class AbstractBaseLayoutManager
                 "getContentAreaIPD() called when it should have been overridden");
     }
 
-    /**
-     * {@inheritDoc}
-     * <i>NOTE: Should be overridden by subclasses.
-     * Default implementation throws an <code>UnsupportedOperationException</code>.</i>
-     */
     public int getContentAreaBPD() {
-        throw new UnsupportedOperationException(
-                "getContentAreaBPD() called when it should have been overridden");
+        return 0;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java
index b489760ce..8a82f2398 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java
@@ -113,7 +113,7 @@ public class FloatContentLayoutManager extends SpacedBorderedPaddedBlockLayoutMa
         for (LayoutManager childLM : childLMs) {
             if (childLM instanceof TableLayoutManager) {
                 ipd += childLM.getContentAreaIPD();
-            } else {
+            } else if (childLM.getContentAreaBPD() != -1) {
                 ipd += getContentAreaIPD(childLM.getChildLMs());
             }
         }