Bugzilla 42703: white-space incorrectly handled in retrieved markers

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

1 files changed, 3 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index 8665ed810..6cdd359f9 100644
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -19,26 +19,17 @@
 
 package org.apache.fop.fo.flow;
 
-import java.util.HashMap;
 import java.util.Iterator;
 
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOPropertyMapping;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.FOText;
 import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.StaticPropertyList;
 import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.PropertyMaker;
-import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
-
-
 /**
  * The retrieve-marker formatting object.
  * This will create a layout manager that will retrieve
@@ -145,14 +136,14 @@ public class RetrieveMarker extends FObjMixed {
                 }
                 cloneSubtree(child.getChildNodes(), newChild,
                         marker, newPropertyList);
-                if (newChild instanceof FObjMixed) {
-                    handleWhiteSpaceFor((FObjMixed) newChild);
-                }
             } else if (child instanceof FOText) {
                 FOText ft = (FOText) newChild;
                 ft.bind(parentPropertyList);
             }
             addChildTo(newChild, (FObj) newParent);
+            if (newChild instanceof FObjMixed) {
+                handleWhiteSpaceFor((FObjMixed) newChild);
+            }
         }
     }