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

diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
index dbb090fe8dc5a686eb7ec549412035d877ec46a0..b9848ab0af7da89e709baed077713d1918a79d6b 100755 (executable)
--- 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 484504fda38cb60aa0d7a00e8594b96d38c143f5..d16ea1308f94ee1a1b50288dd929bf682f99348c 100644 (file)
--- 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>