bugzilla #53942: fo:flow not rendered with -awt; patch 29465 submitted by Robert...

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

diff --git a/src/java/org/apache/fop/area/BodyRegion.java b/src/java/org/apache/fop/area/BodyRegion.java
index 61de7852b4a8c24193fc4b319c9520feac616a07..8621fce8c76ccd4e77cfde6291285665752eaec4 100644 (file)
--- a/src/java/org/apache/fop/area/BodyRegion.java
+++ b/src/java/org/apache/fop/area/BodyRegion.java
@@ -132,7 +132,7 @@ public class BodyRegion extends RegionReference {
      */
     public int getRemainingBPD() {
         int usedBPD = 0;
-        List spans = getMainReference().getSpans();
+        List<Span> spans = getMainReference().getSpans();
         int previousSpanCount = spans.size() - 1;
         for (int i = 0; i < previousSpanCount; i++) {
             usedBPD += ((Span)spans.get(i)).getHeight();
@@ -155,6 +155,7 @@ public class BodyRegion extends RegionReference {
     public Object clone() throws CloneNotSupportedException {
         BodyRegion br = (BodyRegion) super.clone();
         br.mainReference = new MainReference(br);
+        br.mainReference.setSpans(mainReference.getSpans());
         return br;
     }
 

diff --git a/src/java/org/apache/fop/area/MainReference.java b/src/java/org/apache/fop/area/MainReference.java
index 13c92df9c7b57b9b9911859a374b140d08582d78..58c0b2eaf63351360d4fcdc40d52c17d4ed13595 100644 (file)
--- a/src/java/org/apache/fop/area/MainReference.java
+++ b/src/java/org/apache/fop/area/MainReference.java
@@ -74,7 +74,7 @@ public class MainReference extends Area {
      *
      * @return the list of span areas
      */
-    public List getSpans() {
+    public List<Span> getSpans() {
         return spanAreas;
     }
 
@@ -131,7 +131,7 @@ public class MainReference extends Area {
      * @param wmtg a WM traits getter
      */
     public void setWritingModeTraits(WritingModeTraitsGetter wmtg) {
-        for ( Span s : (List<Span>) getSpans() ) {
+        for ( Span s : getSpans() ) {
             s.setWritingModeTraits ( wmtg );
         }
     }