Author: phancock
Date: Fri Mar 2 10:04:26 2012
New Revision: 1296106
URL: http://svn.apache.org/viewvc?rev=1296106&view=rev
Log:
Fix of a bug introduced when merging ImproveAccessibility.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java?rev=1296106&r1=1296105&r2=1296106&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/DelegatingFOEventHandler.java
Fri Mar 2 10:04:26 2012
@@ -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 DelegatingFOEventH
delegate.endExternalDocument(document);
}
+ @Override
+ public FormattingResults getResults() {
+ return delegate.getResults();
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java?rev=1296106&r1=1296105&r2=1296106&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java Fri
Mar 2 10:04:26 2012
@@ -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;
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=1296106&r1=1296105&r2=1296106&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Fri Mar
2 10:04:26 2012
@@ -224,13 +224,7 @@ public class FOTreeBuilder extends Defau
* @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();
}
/**
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1296106&r1=1296105&r2=1296106&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Mar 2 10:04:26 2012
@@ -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.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
