Author: gadams
Date: Wed Apr 25 13:54:22 2012
New Revision: 1330296
URL: http://svn.apache.org/viewvc?rev=1330296&view=rev
Log:
Bugzilla #51484: Don't write final /sect suffix in RTF if section is last
section.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java?rev=1330296&r1=1330295&r2=1330296&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
Wed Apr 25 13:54:22 2012
@@ -28,6 +28,7 @@ package org.apache.fop.render.rtf.rtflib
import java.io.IOException;
import java.io.Writer;
+import java.util.List;
/**
* <p>Models a section in an RTF document</p>
@@ -192,7 +193,11 @@ implements
* @throws IOException for I/O problems
*/
protected void writeRtfSuffix() throws IOException {
- writeControlWord("sect");
+ List siblings = parent.getChildren();
+ // write suffix /sect only if this section is not last section (see
bug #51484)
+ if ( siblings.listIterator ( siblings.indexOf ( this ) ) . hasNext() )
{
+ writeControlWord("sect");
+ }
}
private void closeCurrentTable() throws IOException {
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1330296&r1=1330295&r2=1330296&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Apr 25 13:54:22 2012
@@ -63,6 +63,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="Fonts" dev="GA" type="fix" fixes-bug="51484"
due-to="Benjamin Riefenstahl">
+ Don't write final /sect suffix in RTF if section is last section.
+ </action>
<action context="Fonts" dev="GA" type="fix" fixes-bug="53143">
Ensure fonts are not loaded twice (redundantly).
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
