Fixed wrong defaults for conditionality component for padding-before and padding...

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

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 7490cb941e4ceeef5a4874d059ea4697ce314a31..fca91b15b108ae89696c3c6079e2a69b0d7db9e5 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -997,7 +997,7 @@ public class FOPropertyMapping implements Constants {
         // padding-before
         m  = new CondLengthProperty.Maker(PR_PADDING_BEFORE);
         m.useGeneric(genericCondPadding);
-        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("retain");
+        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("discard");
         corr = new CorrespondingPropertyMaker(m);
         corr.setCorresponding(PR_PADDING_TOP, PR_PADDING_TOP,
                 PR_PADDING_RIGHT);
@@ -1007,7 +1007,7 @@ public class FOPropertyMapping implements Constants {
         // padding-after
         m  = new CondLengthProperty.Maker(PR_PADDING_AFTER);
         m.useGeneric(genericCondPadding);
-        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("retain");
+        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("discard");
         corr = new CorrespondingPropertyMaker(m);
         corr.setCorresponding(PR_PADDING_BOTTOM, PR_PADDING_BOTTOM,
                 PR_PADDING_LEFT);