Changed signature for static handleWhiteSpaceFor(), and used internally to make the code a bit more compact

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
index a276e4214..ae06d8399 100644
--- a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
@@ -111,7 +111,7 @@ public abstract class AbstractRetrieveMarker extends FObjMixed {
                 addChildTo(newChild, (FObj) newParent);
                 if (newChild.getNameId() == FO_TABLE) {
                     Table t = (Table) child;
-                    cloneSubtree(t.getColumns().listIterator(),
+                    cloneSubtree(t.getColumns().iterator(),
                             newChild, marker, newPropertyList);
                     cloneSingleNode(t.getTableHeader(),
                             newChild, marker, newPropertyList);
@@ -129,8 +129,9 @@ public abstract class AbstractRetrieveMarker extends FObjMixed {
                 ft.bind(parentPropertyList);
                 addChildTo(newChild, (FObj) newParent);
             }
+            // trigger 'end-of-node' white-space handling
             if (newChild instanceof FObjMixed) {
-                handleWhiteSpaceFor((FObjMixed) newChild);
+                handleWhiteSpaceFor((FObjMixed) newChild, null);
             }
         }
     }
@@ -169,7 +170,7 @@ public abstract class AbstractRetrieveMarker extends FObjMixed {
         }
         cloneSubtree(marker.getChildNodes(), this,
                         marker, propertyList);
-        handleWhiteSpaceFor(this);
+        handleWhiteSpaceFor(this, null);
     }
 
     /**