You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2006/01/25 15:08:41 UTC
svn commit: r372220 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
Author: jeremias
Date: Wed Jan 25 06:08:37 2006
New Revision: 372220
URL: http://svn.apache.org/viewcvs?rev=372220&view=rev
Log:
To avoid NPEs due to my latest fix, use the default simple-page-master from the page-sequence-master if one is used.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=372220&r1=372219&r2=372220&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java Wed Jan 25 06:08:37 2006
@@ -60,6 +60,7 @@
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.pagination.PageSequenceMaster;
import org.apache.fop.fo.pagination.Region;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.pagination.StaticContent;
@@ -174,6 +175,20 @@
*/
public void startPageSequence(PageSequence pageSeq) {
try {
+ //This is needed for region handling
+ if (this.pagemaster == null) {
+ String reference = pageSeq.getMasterReference();
+ this.pagemaster
+ = pageSeq.getRoot().getLayoutMasterSet().getSimplePageMaster(reference);
+ if (this.pagemaster == null) {
+ log.warn("Only simple-page-masters are supported on page-sequences: " + reference);
+ log.warn("Using default simple-page-master from page-sequence-master...");
+ PageSequenceMaster master
+ = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(reference);
+ this.pagemaster = master.getNextSimplePageMaster(false, false, false);
+ }
+ }
+
if (bDefer) {
return;
}
@@ -181,19 +196,13 @@
sect = docArea.newSection();
//read page size and margins, if specified
-
- String reference = pageSeq.getMasterReference();
-
- this.pagemaster
- = pageSeq.getRoot().getLayoutMasterSet().getSimplePageMaster(reference);
-
//only simple-page-master supported, so pagemaster may be null
if (pagemaster != null) {
sect.getRtfAttributes().set(
PageAttributesConverter.convertPageAttributes(
pagemaster));
} else {
- log.warn("Only simple-page-masters are supported on page-sequences: " + reference);
+ log.warn("No simple-page-master could be determined!");
}
builderContext.pushContainer(sect);
@@ -204,6 +213,9 @@
// TODO could we throw Exception in all FOEventHandler events?
log.error("startPageSequence: " + ioe.getMessage());
//TODO throw new FOPException(ioe);
+ } catch (FOPException fope) {
+ // TODO could we throw Exception in all FOEventHandler events?
+ log.error("startPageSequence: " + fope.getMessage());
}
}
@@ -218,11 +230,13 @@
//Now process all deferred FOs.
bDefer = false;
recurseFONode(pageSeq);
+ this.pagemaster = null;
bDefer = true;
return;
} else {
builderContext.popContainer();
+ this.pagemaster = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org