From: Vincent Hennebert <vhennebert@apache.org>
Date: Fri, 15 Feb 2008 18:33:12 +0000 (+0000)
Subject: rowStarted doesn't need to be set in the signalNewRow method. If it is, it will preve... 
X-Git-Tag: fop-0_95beta~64
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=70d511b80f4099730738077cf15dc39a062df89a;p=xmlgraphics-fop.git

rowStarted doesn't need to be set in the signalNewRow method. If it is, it will prevent the startTablePart event from being triggered on RowGroupBuilder, in addChildNode. This will lead to a NPE being thrown in CollapsingBorderResolver because it would be improperly set up.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@628140 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/fo/flow/table/TableBody.java b/src/java/org/apache/fop/fo/flow/table/TableBody.java
index 7df1ed0a7..c3642c260 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableBody.java
@@ -286,7 +286,6 @@ public class TableBody extends TableCellContainer {
                 getTable().getRowGroupBuilder().endRow(this);
             }
         }
-        rowsStarted = true;
     }
 
 }
diff --git a/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo b/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
index d109797a4..3e798ab5f 100644
--- a/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
+++ b/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
@@ -32,7 +32,7 @@
     <fo:flow flow-name="xsl-region-body">
       <!-- Table 1: no header, no footer, one body (1 row) -->
       <fo:table width="10cm" space-before="12pt" table-layout="fixed"
-        border-collapse="separate" border="1pt solid black">
+        border-collapse="collapse" border="1pt solid black">
         <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
         <fo:table-body>
           <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
@@ -54,7 +54,7 @@
 
       <!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
       <fo:table width="10cm" space-before="12pt" table-layout="fixed"
-        border-collapse="separate" border="1pt solid black">
+        border-collapse="collapse" border="1pt solid black">
         <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
         <fo:table-body>
           <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
@@ -88,7 +88,7 @@
 
       <!-- Table 5: one header (1 row), no footer, one body (1 row) -->
       <fo:table width="10cm" space-before="12pt" table-layout="fixed"
-        border-collapse="separate" border="1pt solid black">
+        border-collapse="collapse" border="1pt solid black">
         <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
         <fo:table-header>
           <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
@@ -116,7 +116,7 @@
 
       <!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
       <fo:table width="10cm" space-before="12pt" table-layout="fixed"
-        border-collapse="separate" border="1pt solid black">
+        border-collapse="collapse" border="1pt solid black">
         <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
         <fo:table-header>
           <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
@@ -160,7 +160,7 @@
 
       <!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
       <fo:table width="10cm" space-before="12pt" table-layout="fixed"
-        border-collapse="separate" border="1pt solid black">
+        border-collapse="collapse" border="1pt solid black">
         <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
         <fo:table-header>
           <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>