Author: cbowditch
Date: Mon Feb 25 14:19:46 2013
New Revision: 1449718
URL: http://svn.apache.org/r1449718
Log:
FOP-2215; NullPointerException when generating IF with fox:external-document
Submitted by Simon Steiner (ssteiner.at.thunderhead.com)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1449718&r1=1449717&r2=1449718&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Mon Feb 25 14:19:46 2013
@@ -294,7 +294,10 @@ implements IFConstants, IFPainter, IFDoc
AttributesImpl atts = new AttributesImpl();
addAttribute(atts, "index", Integer.toString(index));
addAttribute(atts, "name", name);
- addAttribute(atts, "page-master-name", pageMasterName);
+ if (pageMasterName != null) {
+ //fox:external-document doesn't have a page-master
+ addAttribute(atts, "page-master-name", pageMasterName);
+ }
addAttribute(atts, "width", Integer.toString(size.width));
addAttribute(atts, "height", Integer.toString(size.height));
addForeignAttributes(atts);
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1449718&r1=1449717&r2=1449718&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Feb 25 14:19:46 2013
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="CB" type="fix" fixes-bug="FOP-2215"
due-to="Simon Steiner">
+ NullPointerException when generating IF with fox:external-document
+ </action>
<action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2206"
due-to="Luis Bernardo">
Add support for CS placement and escapement data in PS renderer.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
