Hi,

attached patch fix:

- missing bracket in pntxta/pntxtb control word
- \*\listoverride->listoveride - listoveride is not star control word

Please commit, if patch ready.

  Pavel Kysilka
Index: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
===================================================================
--- src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java	(revision 697568)
+++ src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java	(working copy)
@@ -151,7 +151,7 @@
                 final RtfListStyle style = (RtfListStyle)it.next();
 
                 writeGroupMark(true);
-                writeStarControlWordNS(LIST_OVR);
+                writer.write("\\" + LIST_OVR);
                 writeGroupMark(true);
 
                 writeOneAttributeNS(LIST_ID, style.getRtfList().getListId().toString());
@@ -219,4 +219,4 @@
         styles.add(ls);
         return styles.size();
     }
-}
\ No newline at end of file
+}
Index: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
===================================================================
--- src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java	(revision 697568)
+++ src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java	(working copy)
@@ -64,9 +64,11 @@
         item.writeGroupMark(true);
         //item.writeControlWord("pndec");
         item.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, "2");
+        item.writeGroupMark(true);
         item.writeControlWord("pntxtb");
         RtfStringConverter.getInstance().writeRtfString(item.writer, text);
         item.writeGroupMark(false);
+        item.writeGroupMark(false);
     }
 
     /**
Index: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
===================================================================
--- src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java	(revision 697568)
+++ src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java	(working copy)
@@ -54,9 +54,11 @@
         item.writeGroupMark(true);
         item.writeControlWord("pndec");
         item.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, "2");
+        item.writeGroupMark(true);
         item.writeControlWord("pntxtb");
         item.writeControlWord("'b7");
         item.writeGroupMark(false);
+        item.writeGroupMark(false);
     }
 
     /**
Index: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
===================================================================
--- src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java	(revision 697568)
+++ src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java	(working copy)
@@ -52,7 +52,9 @@
         item.writeOneAttribute("pnstart", new Integer(1));
         item.writeOneAttribute("pnindent",
                 item.attrib.getValue(RtfListTable.LIST_INDENT));
+        item.writeGroupMark(true);
         item.writeControlWord("pntxta.");
+        item.writeGroupMark(false);
     }
 
     /**

Reply via email to