Peter Herweg's patch applied:

http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=9128

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197013 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
index 1297ba11cf7eaf563b394467e25f336ba3fa8033..01f21baf9e28a7a2c87dd98c3395aa27cd1965ae 100644 (file)
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
@@ -210,7 +210,9 @@ public class RtfColorTable {
         }
 
         header.writeGroupMark (true);
-        header.writeControlWord ("colortbl;");
+        //Don't use writeControlWord, because it appends a blank,
+        //which may confuse Wordpad.
+        header.write ("\\colortbl;");
 
         int len = colorTable.size ();
 
@@ -236,7 +238,7 @@ public class RtfColorTable {
      * @param i Identifier of color
      */
     private void addColor (Integer i) {
-        colorIndex.put (i, new Integer (colorTable.size () + 1));
+        colorIndex.put (i, new Integer (colorTable.size ()));
         colorTable.addElement (i);
     }
 
@@ -271,4 +273,4 @@ public class RtfColorTable {
 
         return retVal < 0 ? retVal + 256 : retVal;
     }
-}
\ No newline at end of file
+}