Author: vhennebert
Date: Thu Sep 2 17:34:43 2010
New Revision: 992029
URL: http://svn.apache.org/viewvc?rev=992029&view=rev
Log:
Implemented reset method for changing IPD
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=992029&r1=992028&r2=992029&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Thu Sep 2 17:34:43 2010
@@ -552,4 +552,11 @@ public class TableLayoutManager extends
}
}
+ /** {...@inheritdoc} */
+ public void reset() {
+ super.reset();
+ curBlockArea = null;
+ tableUnit = 0.0;
+ }
+
}
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml?rev=992029&r1=992028&r2=992029&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
Thu Sep 2 17:34:43 2010
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
