Simplified addAreasAndFlushRow: there can no longer be null GridUnits, every hole...

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

diff --git a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
index f78d47b52026e0a2052b4de3bd06a276fda75739..880e4428208ce9d7321f786e3a84f6b334edb5c0 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
+++ b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
@@ -173,7 +173,7 @@ class RowPainter {
             
             if (primaryGridUnits[i] != null) {
                 if (forcedFlush || ((end[i] == primaryGridUnits[i].getElements().size() - 1)
-                        && (currentGU == null || currentGU.isLastGridUnitRowSpan()))) {
+                        && currentGU.isLastGridUnitRowSpan())) {
                     //the last line in the "if" above is to avoid a premature end of a
                     //row-spanned cell because no CellParts are generated after a cell is
                     //finished with its content.
@@ -185,7 +185,7 @@ class RowPainter {
                     end[i] = -1;
                     partBPD[i] = 0;
                 }
-            } else if (currentGU != null && !currentGU.isEmpty()
+            } else if (!currentGU.isEmpty()
                     && currentGU.getColSpanIndex() == 0
                     && (forcedFlush || currentGU.isLastGridUnitRowSpan())) {
                 //A row-spanned cell has finished contributing content on the previous page