Moved table row ID creation so that the ID will always be created

if the row layout restarts.
PR: 12876

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195252 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index 3d6e9aba18169ad6d0d8f2b56d9e25caeeec9729..a74da108afe132c68f54fa1fea66d57e73f9cfdf 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -209,8 +209,6 @@ public class TableRow extends FObj {
     }
 
     public Status layout(Area area) throws FOPException {
-        boolean configID = false;
-
         if (this.marker == BREAK_AFTER) {
             return new Status(Status.OK);
         }
@@ -226,9 +224,9 @@ public class TableRow extends FObj {
                 initCellArray();
                 // check to make sure this row hasn't been partially
                 // laid out yet (with an id created already)
-                area.getIDReferences().createID(id);
-                configID = true;
             }
+            // create ID also in case the row has been reset
+            area.getIDReferences().createID(id);
 
             this.marker = 0;
             int breakStatus = propMgr.checkBreakBefore(area);
@@ -236,7 +234,6 @@ public class TableRow extends FObj {
                 return new Status(breakStatus);
         }
 
-        // if (marker == 0 && configID) {
         if (marker == 0) {    // KDL: need to do this if thrown or if split?
             // configure id
             area.getIDReferences().configureID(id, area);