1 files changed, 5 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
index 49b98f101..2ce33fb4c 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
@@ -290,22 +290,18 @@ public class TableStepper {
         return maxW;
     }
 
-    private void setupElementList(int column) {
-        GridUnit gu = getActiveGridUnit(column);
-        EffRow row = getActiveRow();
-        if (gu != null && !gu.isEmpty() && gu.isPrimary()) {
-            activeCells.add(new ActiveCell((PrimaryGridUnit) gu, row, activeRowIndex, rowGroup, getTableLM()));
-        }
-    }
-
     /**
      * Initializes the informations relative to the Knuth elements, to handle a new row in
      * the current row group.
      */
     private void initializeElementLists() {
         log.trace("Entering initializeElementLists()");
+        EffRow row = getActiveRow();
         for (int i = 0; i < columnCount; i++) {
-            setupElementList(i);
+            GridUnit gu = getActiveGridUnit(i);
+            if (gu != null && !gu.isEmpty() && gu.isPrimary()) {
+                activeCells.add(new ActiveCell((PrimaryGridUnit) gu, row, activeRowIndex, rowGroup, getTableLM()));
+            }
         }
     }