From: Vincent Hennebert <vhennebert@apache.org>
Date: Thu, 2 Sep 2010 17:34:43 +0000 (+0000)
Subject: Implemented reset method for changing IPD
X-Git-Tag: fop-1_1rc1old~449
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6faeb0d39411199ab9db8cd94cd235aa63f8249a;p=xmlgraphics-fop.git

Implemented reset method for changing IPD


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

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 2b432d0d4..7e343697a 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -552,4 +552,11 @@ public class TableLayoutManager extends BlockStackingLayoutManager
         }
     }
 
+    /** {@inheritDoc} */
+    public void reset() {
+        super.reset();
+        curBlockArea = null;
+        tableUnit = 0.0;
+    }
+
 }
diff --git a/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml b/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
index 956563e20..1b10d722c 100644
--- a/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
+++ b/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
@@ -56,13 +56,19 @@
           <fo:table table-layout="fixed" width="100%">
             <fo:table-body>
               <fo:table-row>
-                <fo:table-cell>
-                  <fo:block>After the table 1</fo:block>
+                <fo:table-cell border="1pt solid black">
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="1pt solid black">
+                  <fo:block>Cell 1.2</fo:block>
                 </fo:table-cell>
               </fo:table-row>
               <fo:table-row>
-                <fo:table-cell>
-                  <fo:block>After the table 2</fo:block>
+                <fo:table-cell border="1pt solid black">
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="1pt solid black">
+                  <fo:block>Cell 2.2</fo:block>
                 </fo:table-cell>
               </fo:table-row>
             </fo:table-body>
@@ -74,7 +80,12 @@
   <checks>
     <eval expected="Block before the page break." xpath="//pageViewport[1]//flow/block[2]//text"/>
     <eval expected="Block after the page break."  xpath="//pageViewport[2]//flow/block[1]//text"/>
-    <eval expected="After the table 1"            xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
-    <eval expected="After the table 2"            xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+    <eval expected="400000"                       xpath="//pageViewport[2]//flow/block[2]/@ipd"/>
+    <eval expected="199000"                       xpath="//pageViewport[2]//flow/block[2]/block[1]/@ipd"/>
+    <eval expected="Cell 1.1"                     xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
+    <eval expected="199000"                       xpath="//pageViewport[2]//flow/block[2]/block[2]/@ipd"/>
+    <eval expected="Cell 1.2"                     xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+    <eval expected="Cell 2.1"                     xpath="//pageViewport[2]//flow/block[2]/block[3]//text"/>
+    <eval expected="Cell 2.2"                     xpath="//pageViewport[2]//flow/block[2]/block[4]//text"/>
   </checks>
 </testcase>