Removed endPart() method and moved its content into addAreasAndFlushRow()

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

2 files changed, 3 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
index f31076537..1af05cc99 100644
--- a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
+++ b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
@@ -187,8 +187,10 @@ class RowPainter {
             // (header, footer, body) has been reached, and the next row will anyway be
             // different from the current one, and this is unnecessary to recall this
             // method in the first lines of handleTableContentPosition, so we may reset
-            // lastRow
+            // the following variables
             lastRow = null;
+            firstRowIndex = -1;
+            rowOffsets.clear();
         }
         return actualRowHeight;
     }
@@ -358,9 +360,4 @@ class RowPainter {
     private int getRowOffset(int rowIndex) {
         return ((Integer) rowOffsets.get(rowIndex - firstRowIndex)).intValue();
     }
-
-    void endPart() {
-        firstRowIndex = -1;
-        rowOffsets.clear();
-    }
 }
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
index 308b2cca7..57972078e 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
@@ -418,7 +418,6 @@ public class TableContentLayoutManager implements PercentBaseContext {
             handleMarkersAndPositions(lst, body, firstPos, false, painter);
         }
         painter.addAreasAndFlushRow(true);
-        painter.endPart();
     }
 
     private void handleMarkersAndPositions(List positions, TableBody body, boolean firstPos,