diff options
-rw-r--r-- | src/java/org/apache/fop/fo/DelegatingFOEventHandler.java | 6 | ||||
-rw-r--r-- | src/java/org/apache/fop/fo/FOEventHandler.java | 5 | ||||
-rw-r--r-- | src/java/org/apache/fop/fo/FOTreeBuilder.java | 8 | ||||
-rw-r--r-- | status.xml | 6 |
4 files changed, 18 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java b/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java index e64106a80..50026c996 100644 --- 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 b7bcd4215..33cc507c5 100644 --- 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 38f74d8fd..938efb8f9 100644 --- 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 440d0e3ba..4d6914e9f 100644 --- 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. |