Author: vhennebert
Date: Thu Jan 10 09:54:16 2008
New Revision: 610853
URL: http://svn.apache.org/viewvc?rev=610853&view=rev
Log:
Simplified addAreasAndFlushRow
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=610853&r1=610852&r2=610853&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
Thu Jan 10 09:54:16 2008
@@ -169,27 +169,11 @@
tclm.addRowBackgroundArea(rowFO, actualRowHeight,
layoutContext.getRefIPD(), yoffset);
for (int i = 0; i < primaryGridUnits.length; i++) {
GridUnit currentGU = lastRow.getGridUnit(i);
- if (primaryGridUnits[i] != null) {
- if (forcedFlush || 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.
- //See table-cell_number-rows-spanned_bug38397.xml
- addAreasForCell(primaryGridUnits[i], start[i], end[i],
lastRow, partBPD[i],
- actualRowHeight);
- primaryGridUnits[i] = null;
- start[i] = 0;
- end[i] = -1;
- partBPD[i] = 0;
- }
- } else if (!currentGU.isEmpty()
- && currentGU.getColSpanIndex() == 0
+ if (!currentGU.isEmpty() && currentGU.getColSpanIndex() == 0
&& (forcedFlush || currentGU.isLastGridUnitRowSpan())) {
- //A row-spanned cell has finished contributing content on the
previous page
- //and now still has to cause grid units to be painted.
- //See table-cell_page-break_span.xml
addAreasForCell(currentGU.getPrimary(), start[i], end[i],
lastRow, partBPD[i],
actualRowHeight);
+ primaryGridUnits[i] = null;
start[i] = 0;
end[i] = -1;
partBPD[i] = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
