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/07/17 19:57:41 UTC
svn commit: r556997 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
Author: vhennebert
Date: Tue Jul 17 10:57:40 2007
New Revision: 556997
URL: http://svn.apache.org/viewvc?view=rev&rev=556997
Log:
Store the index of the last spanned row, instead of the starting row. That latter information isn't really needed.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?view=diff&rev=556997&r1=556996&r2=556997
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Tue Jul 17 10:57:40 2007
@@ -31,8 +31,8 @@
/** Knuth elements for this active cell. */
private List elementList;
private boolean prevIsBox = false;
- /** Number of the row where the row-span begins, zero-based. */
- private int startRow;
+ /** Number of the row where the row-span ends, zero-based. */
+ private int endRow;
/** Index, in the list of Knuth elements, of the element starting the current step. */
private int start;
/** Index, in the list of Knuth elements, of the element ending the current step. */
@@ -97,14 +97,14 @@
paddingAfter = pgu.getBorders().getPaddingAfter(false, pgu.getCellLM());
start = 0;
end = -1;
- startRow = rowIndex;
+ endRow = rowIndex + pgu.getCell().getNumberRowsSpanned() - 1;
keepWithNextSignal = false;
remainingLength = totalLength;
goToNextLegalBreak();
}
boolean endsOnRow(int rowIndex) {
- return rowIndex == startRow + pgu.getCell().getNumberRowsSpanned() - 1;
+ return rowIndex == endRow;
}
int getRemainingHeight(int activeRowIndex, EffRow[] rowGroup) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org