From 7937897c8959d648d53651a9d151456c8920b629 Mon Sep 17 00:00:00 2001
From: "Andreas L. Delmelle" <adelmelle@apache.org>
Date: Sun, 16 Sep 2007 12:52:28 +0000
Subject: Bugzilla 42705: Fixed swallowing PCDATA during white-space removal in
 retrieved markers.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@576095 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/fo/FOText.java              | 6 +++---
 src/java/org/apache/fop/fo/flow/RetrieveMarker.java | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 8d9111b02..6d1ac417f 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -158,9 +158,9 @@ public class FOText extends FONode {
                 System.arraycopy(ca, 0, ft.ca, 0, ca.length);
             }
         }
-        prevFOTextThisBlock = null;
-        nextFOTextThisBlock = null;
-        ancestorBlock = null;
+        ft.prevFOTextThisBlock = null;
+        ft.nextFOTextThisBlock = null;
+        ft.ancestorBlock = null;
         return ft;
     }
 
diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index 3a7328b6b..c63e7baa9 100644
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -181,6 +181,7 @@ public class RetrieveMarker extends FObjMixed {
         }
         cloneSubtree(marker.getChildNodes(), this, 
                         marker, propertyList);
+        handleWhiteSpaceFor(this);
     }
 
     /**
-- 
cgit v1.2.3