Browse Source

Fix compiler warnings

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1736997 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-2_2
Simon Steiner 8 years ago
parent
commit
1e47ef470b

+ 1
- 1
fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java View File

} }
while (baseIter.hasNext()) { while (baseIter.hasNext()) {
// this happens when the retrieve-table-marker has been resolved // this happens when the retrieve-table-marker has been resolved
FONode child = (FONode) baseIter.next();
FONode child = baseIter.next();
makeLayoutManagers(child, lms); makeLayoutManagers(child, lms);
} }
} }

+ 3
- 3
fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java View File

adjustYOffset(curBlockArea, borderBeforeWidth); adjustYOffset(curBlockArea, borderBeforeWidth);
Block[][] blocks = new Block[getTableCell().getNumberRowsSpanned()][getTableCell() Block[][] blocks = new Block[getTableCell().getNumberRowsSpanned()][getTableCell()
.getNumberColumnsSpanned()]; .getNumberColumnsSpanned()];
GridUnit[] gridUnits = (GridUnit[]) primaryGridUnit.getRows().get(startRow);
GridUnit[] gridUnits = primaryGridUnit.getRows().get(startRow);
int level = getTableCell().getBidiLevelRecursive(); int level = getTableCell().getBidiLevelRecursive();
for (int x = 0; x < getTableCell().getNumberColumnsSpanned(); x++) { for (int x = 0; x < getTableCell().getNumberColumnsSpanned(); x++) {
GridUnit gu = gridUnits[x]; GridUnit gu = gridUnits[x];
adjustBPD(blocks[startRow][x], -borderWidth); adjustBPD(blocks[startRow][x], -borderWidth);
} }
} }
gridUnits = (GridUnit[]) primaryGridUnit.getRows().get(endRow);
gridUnits = primaryGridUnit.getRows().get(endRow);
for (int x = 0; x < getTableCell().getNumberColumnsSpanned(); x++) { for (int x = 0; x < getTableCell().getNumberColumnsSpanned(); x++) {
GridUnit gu = gridUnits[x]; GridUnit gu = gridUnits[x];
BorderInfo border = gu.getBorderAfter(borderAfterWhich); BorderInfo border = gu.getBorderAfter(borderAfterWhich);
} }
} }
for (int y = startRow; y <= endRow; y++) { for (int y = startRow; y <= endRow; y++) {
gridUnits = (GridUnit[]) primaryGridUnit.getRows().get(y);
gridUnits = primaryGridUnit.getRows().get(y);
BorderInfo border = gridUnits[0].getBorderStart(); BorderInfo border = gridUnits[0].getBorderStart();
int borderWidth = border.getRetainedWidth() / 2; int borderWidth = border.getRetainedWidth() / 2;
if (borderWidth > 0) { if (borderWidth > 0) {

Loading…
Cancel
Save