diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2007-09-16 12:52:28 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2007-09-16 12:52:28 +0000 |
| commit | 7937897c8959d648d53651a9d151456c8920b629 (patch) | |
| tree | 479821933f46327f4b4c9fda8b70235d9fbc8156 /src | |
| parent | 9a50626fd30bee2f4c62eea748da61d38f163a22 (diff) | |
| download | xmlgraphics-fop-7937897c8959d648d53651a9d151456c8920b629.tar.gz xmlgraphics-fop-7937897c8959d648d53651a9d151456c8920b629.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/org/apache/fop/fo/FOText.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/RetrieveMarker.java | 1 |
2 files changed, 4 insertions, 3 deletions
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); } /** |