You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2008/03/11 12:02:34 UTC
svn commit: r635884 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
test/layoutengine/standard-testcases/table_backgrounds_2.xml
Author: vhennebert
Date: Tue Mar 11 04:02:27 2008
New Revision: 635884
URL: http://svn.apache.org/viewvc?rev=635884&view=rev
Log:
Fixed a copy-paste error (getPaddingStart instead of getPaddingEnd)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=635884&r1=635883&r2=635884&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Tue Mar 11 04:02:27 2008
@@ -545,7 +545,7 @@
private Block getBackgroundArea(int bpd, int borderBeforeWidth) {
CommonBorderPaddingBackground padding = getTableCell().getCommonBorderPaddingBackground();
int paddingStart = padding.getPaddingStart(false, this);
- int paddingEnd = padding.getPaddingStart(false, this);
+ int paddingEnd = padding.getPaddingEnd(false, this);
Block block = new Block();
TraitSetter.setProducerID(block, getTable().getId());
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml?rev=635884&r1=635883&r2=635884&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml Tue Mar 11 04:02:27 2008
@@ -36,28 +36,28 @@
<fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
<fo:table-body>
<fo:table-row>
- <fo:table-cell id="bg-cell" padding="2pt 4pt" border="solid 2pt" background-color="lightgray">
+ <fo:table-cell id="bg-cell" padding="2pt 3pt 4pt 5pt" border="solid 2pt" background-color="lightgray">
<fo:block>background on cell</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt 4pt" border="solid 2pt" background-color="lightgray">
+ <fo:table-cell padding="2pt 3pt 4pt 5pt" border="solid 2pt" background-color="lightgray">
<fo:block>background on cell</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row background-color="yellow">
- <fo:table-cell id="bg-row" padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell id="bg-row" padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on row</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on row</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
<fo:table-body background-color="orange">
<fo:table-row>
- <fo:table-cell id="bg-body" padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell id="bg-body" padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on body</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on body</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -68,10 +68,10 @@
background-color="violet"/>
<fo:table-body>
<fo:table-row>
- <fo:table-cell id="bg-col" padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell id="bg-col" padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on column</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on column</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -81,10 +81,10 @@
<fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
<fo:table-body>
<fo:table-row>
- <fo:table-cell id="bg-table" padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell id="bg-table" padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on table</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt 4pt" border="solid 2pt">
+ <fo:table-cell padding="2pt 3pt 4pt 5pt" border="solid 2pt">
<fo:block>background on table</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -95,17 +95,17 @@
</fo:root>
</fo>
<checks>
- <eval expected="18400" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@bpd"/>
+ <eval expected="20400" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@bpd"/>
<eval expected="178000" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@ipd"/>
- <eval expected="21400" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@top-offset"/>
+ <eval expected="23400" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@top-offset"/>
<eval expected="1000" xpath="//block[@prod-id='bg-row']/preceding-sibling::block[1]/@left-offset"/>
- <eval expected="18400" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@bpd"/>
+ <eval expected="20400" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@bpd"/>
<eval expected="178000" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@ipd"/>
- <eval expected="41800" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@top-offset"/>
+ <eval expected="45800" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@top-offset"/>
<eval expected="1000" xpath="//block[@prod-id='bg-body']/preceding-sibling::block[1]/@left-offset"/>
- <eval expected="18400" xpath="//block[@prod-id='bg-col']/preceding-sibling::block[1]/@bpd"/>
+ <eval expected="20400" xpath="//block[@prod-id='bg-col']/preceding-sibling::block[1]/@bpd"/>
<eval expected="178000" xpath="//block[@prod-id='bg-col']/preceding-sibling::block[1]/@ipd"/>
<eval expected="1000" xpath="//block[@prod-id='bg-col']/preceding-sibling::block[1]/@top-offset"/>
<eval expected="1000" xpath="//block[@prod-id='bg-col']/preceding-sibling::block[1]/@left-offset"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org