aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2007-07-12 13:45:35 +0000
committerVincent Hennebert <vhennebert@apache.org>2007-07-12 13:45:35 +0000
commit21e4d157d54a48a555aa0ff7cdab7e3cef707aa5 (patch)
tree3d575c809114514c6cd49555d47fc84da4138d0a /src
parentbf7425006f728b22486e6d56b0c9ff885fab5635 (diff)
downloadxmlgraphics-fop-21e4d157d54a48a555aa0ff7cdab7e3cef707aa5.tar.gz
xmlgraphics-fop-21e4d157d54a48a555aa0ff7cdab7e3cef707aa5.zip
Temporary hack to handle cells with content of zero length
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@555628 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/TableStepper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
index 2ce33fb4c..4ac0b8604 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
@@ -117,7 +117,7 @@ public class TableStepper {
private void computeBaseWidth(EffRow[] rowGroup) {
width = 0;
- includedLength = 0;
+ includedLength = -1; // Avoid troubles with cells having content of zero length
for (int prevRow = 0; prevRow < startRow; prevRow++) {
width += rowGroup[prevRow].getHeight().opt;
}
@@ -134,7 +134,7 @@ public class TableStepper {
} else if (includedLength == totalLength) {
return 0;
} else {
- return totalLength - includedLength
+ return totalLength - Math.max(0, includedLength)
+ borderBefore + borderAfter + paddingBefore + paddingAfter;
}
}