diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-02-17 13:40:42 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-02-17 13:40:42 +0000 |
| commit | f44cc4954e2471f67987b277e1c7eeaf1b64d3c6 (patch) | |
| tree | ac88914f68fa2dda32887977ec06853423374d96 | |
| parent | d4c62ec3a7b27a2aa1d265171aab2146d3a2b2f3 (diff) | |
| download | xmlgraphics-fop-f44cc4954e2471f67987b277e1c7eeaf1b64d3c6.tar.gz xmlgraphics-fop-f44cc4954e2471f67987b277e1c7eeaf1b64d3c6.zip | |
border-style "hidden" also forces border-width to 0.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198440 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java | 1 | ||||
| -rw-r--r-- | test/layoutengine/testcases/border3.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java index dbb090fe8..b9848ab0a 100755 --- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java @@ -208,6 +208,7 @@ public class CommonBorderPaddingBackground implements Cloneable { public int getBorderWidth(int side, boolean bDiscard) { if ((borderInfo[side] == null) || (borderInfo[side].mStyle == Constants.EN_NONE) + || (borderInfo[side].mStyle == Constants.EN_HIDDEN) || (bDiscard && borderInfo[side].mWidth.isDiscard())) { return 0; } else { diff --git a/test/layoutengine/testcases/border3.xml b/test/layoutengine/testcases/border3.xml index 484504fda..d16ea1308 100644 --- a/test/layoutengine/testcases/border3.xml +++ b/test/layoutengine/testcases/border3.xml @@ -131,7 +131,7 @@ <!-- border-style="hidden" --> <eval expected="hidden" xpath="//flow/block[1]/block[20]/block[1]/lineArea"/> <eval expected="72000" xpath="//flow/block[1]/block[20]/@ipda"/> - <eval expected="62000" xpath="//flow/block[1]/block[20]/@ipd"/> - <eval expected="5000 5000 5000 5000" xpath="//flow/block[1]/block[20]/@bap"/> + <eval expected="72000" xpath="//flow/block[1]/block[20]/@ipd"/> + <eval expected="0 0 0 0" xpath="//flow/block[1]/block[20]/@bap"/> </checks> </testcase> |