1 files changed, 1 insertions, 15 deletions
diff --git a/javax/swing/text/html/ParagraphView.java b/javax/swing/text/html/ParagraphView.java
index e3f2817be..8443515d3 100644
--- a/javax/swing/text/html/ParagraphView.java
+++ b/javax/swing/text/html/ParagraphView.java
@@ -187,28 +187,14 @@ public class ParagraphView
                                                             SizeRequirements r)
   {
     r = super.calculateMinorAxisRequirements(axis, r);
-    if (setCSSSpan(r, axis))
+    if (! setCSSSpan(r, axis))
       {
-        // If we have set the span from CSS, then we need to adjust
-        // the margins.
-        SizeRequirements parent = super.calculateMinorAxisRequirements(axis,
-                                                                       null);
         int margin = axis == X_AXIS ? getLeftInset() + getRightInset()
                                     : getTopInset() + getBottomInset();
         r.minimum -= margin;
         r.preferred -= margin;
         r.maximum -= margin;
       }
-    else
-      {
-        float min = 0;
-        int n = getLayoutViewCount();
-        for (int i = 0; i < n; i++)
-          min = Math.max(getLayoutView(i).getMinimumSpan(axis), min);
-        r.minimum = (int) min;
-        r.preferred = Math.max(r.preferred, r.minimum);
-        r.maximum = Math.max(r.maximum, r.preferred);
-      }
     return r;
   }