You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2007/12/17 20:05:28 UTC
svn commit: r604970 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
Author: vhennebert
Date: Mon Dec 17 11:05:27 2007
New Revision: 604970
URL: http://svn.apache.org/viewvc?rev=604970&view=rev
Log:
Simplified addAreasAndFlushRow: there can no longer be null GridUnits, every hole in the grid is now filled with an EmptyGridUnit
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=604970&r1=604969&r2=604970&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Mon Dec 17 11:05:27 2007
@@ -173,7 +173,7 @@
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 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org