fixed support for basic-link; process table-footer only, if there is one

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

diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index c89378a0ec8133a6d550a00cf7a2310581e6101d..1c31c81f255ecaf5baeb1807015743b6cc11866a 100644 (file)
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -1200,6 +1200,13 @@ public class RTFHandler extends FOEventHandler {
             } else {
                 endBlock( (Block) foNode);
             }
+        } else if (foNode instanceof BasicLink) {
+            //BasicLink must be placed before Inline
+            if (bStart) {
+                startLink( (BasicLink) foNode);
+            } else {
+                endLink();
+            }
         } else if (foNode instanceof Inline) {
             if (bStart) {
                 startInline( (Inline) foNode);
@@ -1216,12 +1223,6 @@ public class RTFHandler extends FOEventHandler {
                 Character c = (Character) foNode;
                 character(c);
             }
-        } else if (foNode instanceof BasicLink) {
-            if (bStart) {
-                startLink( (BasicLink) foNode);
-            } else {
-                endLink();
-            }
         } else if (foNode instanceof PageNumber) {
             if (bStart) {
                 startPageNumber( (PageNumber) foNode);
@@ -1322,7 +1323,7 @@ public class RTFHandler extends FOEventHandler {
             }
             
             //recurse table-footer
-            if (table.getTableHeader()!=null) {
+            if (table.getTableFooter()!=null) {
                 recurseFONode( table.getTableFooter() );
             }