Undid change related to column-keeps

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

src/java/org/apache/fop/layoutmgr/AbstractBreaker.java

@@ -429,13 +429,7 @@ public abstract class AbstractBreaker {
                 ListElement lastBreakElement = effectiveList.getElement(endElementIndex);
                 if (lastBreakElement.isPenalty()) {
                     KnuthPenalty pen = (KnuthPenalty)lastBreakElement;
-                    // TODO Handle keep.within-column differently so that break class is
-                    // automatically set to the right value
-                    if (pen.getP() >= KnuthPenalty.INFINITE - 1) {
-                        lastBreakClass = Constants.EN_COLUMN;
-                    } else {
-                        lastBreakClass = pen.getBreakClass();
-                    }
+                    lastBreakClass = pen.getBreakClass();
                 } else {
                     lastBreakClass = Constants.EN_COLUMN;
                 }