Fix of a bug introduced when merging ImproveAccessibility.

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

diff --git a/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java b/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
index e64106a80a92dc094ff2dbdbb3a2eb8409111d8c..50026c99673c9cf6959b3b18944d0c138bb4fbea 100644 (file)
--- a/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
+++ b/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
@@ -22,6 +22,7 @@ package org.apache.fop.fo;
 import org.xml.sax.SAXException;
 
 import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.FormattingResults;
 import org.apache.fop.fo.extensions.ExternalDocument;
 import org.apache.fop.fo.flow.BasicLink;
 import org.apache.fop.fo.flow.Block;
@@ -401,4 +402,9 @@ public abstract class DelegatingFOEventHandler extends FOEventHandler {
         delegate.endExternalDocument(document);
     }
 
+    @Override
+    public FormattingResults getResults() {
+        return delegate.getResults();
+    }
+
 }

diff --git a/src/java/org/apache/fop/fo/FOEventHandler.java b/src/java/org/apache/fop/fo/FOEventHandler.java
index b7bcd4215e411da1c2a4259a19d3529d3973fe33..33cc507c5fc1194ceb7aef3983be68782259ba44 100644 (file)
--- a/src/java/org/apache/fop/fo/FOEventHandler.java
+++ b/src/java/org/apache/fop/fo/FOEventHandler.java
@@ -22,6 +22,7 @@ package org.apache.fop.fo;
 import org.xml.sax.SAXException;
 
 import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.FormattingResults;
 import org.apache.fop.fo.extensions.ExternalDocument;
 import org.apache.fop.fo.flow.BasicLink;
 import org.apache.fop.fo.flow.Block;
@@ -557,5 +558,9 @@ public abstract class FOEventHandler {
     public void endExternalDocument(ExternalDocument document) {
     }
 
+    public FormattingResults getResults() {
+        return null;
+    }
+
 }
 

diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index 38f74d8fd6d535cf914a365ed618cee989e5749c..938efb8f970c4f1535590d654c980d58d11052f7 100644 (file)
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -224,13 +224,7 @@ public class FOTreeBuilder extends DefaultHandler {
      * @return the results of the rendering process.
      */
     public FormattingResults getResults() {
-        if (getEventHandler() instanceof AreaTreeHandler) {
-            return ((AreaTreeHandler) getEventHandler()).getResults();
-        } else {
-            //No formatting results available for output formats no
-            //involving the layout engine.
-            return null;
-        }
+        return getEventHandler().getResults();
     }
 
     /**

diff --git a/status.xml b/status.xml
index 440d0e3ba36e85080497fe460b99abdb6021c9aa..4d6914e9f1b636c9e52edba9b1e7666b5c19e09a 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -62,6 +62,12 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="PH" type="fix">
+        Fix of a bug introduced when merging ImproveAccessibility.
+      </action>
+      <action context="Code" dev="PH" type="add">
+          Improved support for empty flow-name mapping (see bugzilla#50391).
+      </action>
       <action context="Code" dev="GA" type="add" fixes-bug="32789, 49008, 49687" importance="high">
         Add support for complex scripts, including: full bidi support, support for advanced
         typographic tables, advanced support for number conversion.