Refactor: unwind "for" statement in findNearestAncestorGeneratingRAs() for more flexi...

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

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index a357297749247f8a82e57a065b0ab45711692e77..c008b5ac90d24d78cb6066db786fe94e63dd701b 100644 (file)
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -180,11 +180,11 @@ public class FObj extends FONode {
      * @return FObj of the nearest ancestor that generates Reference Areas
      */
     private FObj findNearestAncestorGeneratingRAs() {
-        FObj p;
-        FONode parent;
-        for (p = this; !p.generatesReferenceAreas()
-                && (parent = p.getParent()) != null
-                && (parent instanceof FObj); p = (FObj) parent) {
+        FObj p = this;
+        FObj parent = p.findNearestAncestorFObj();
+        while (parent != null && !p.generatesReferenceAreas()) {
+            p = (FObj) parent;
+            parent = p.findNearestAncestorFObj();
         }
         return p;
     }