From: Jeremias Maerki <jeremias@apache.org>
Date: Sun, 10 Aug 2008 19:35:27 +0000 (+0000)
Subject: Bugzilla #45606:
X-Git-Tag: fop-1_0~459
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff243bf1dd6062bbe624391a9ef79fc26018a23f;p=xmlgraphics-fop.git

Bugzilla #45606:
Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
Submitted by: Pavel Kysilka <goldenfish.at.linuxsoft.cz>

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

diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
index 06dbaccd5..6694f0a7d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
@@ -144,21 +144,22 @@ public final class RtfFontManager {
         }
 
         header.newLine();
-        header.writeGroupMark (true);
-        header.writeControlWord ("fonttbl;");
+        header.writeGroupMark(true);
+        header.writeControlWord("fonttbl");
 
         int len = fontTable.size ();
 
         for (int i = 0; i < len; i++) {
-            header.writeGroupMark (true);
+            header.writeGroupMark(true);
             header.newLine();
-            header.write ("\\f" + i);
-            header.write (" " + (String) fontTable.elementAt (i));
-            header.writeGroupMark (false);
+            header.write("\\f" + i);
+            header.write(" " + (String) fontTable.elementAt (i));
+            header.write(";");
+            header.writeGroupMark(false);
         }
 
         header.newLine();
-        header.writeGroupMark (false);
+        header.writeGroupMark(false);
     }
 
 
diff --git a/status.xml b/status.xml
index cfdccb72e..a43ebf5e6 100644
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,9 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="JM" type="fix" fixes-bug="45606" due-to="Pavel Kysilka">
+        Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
+      </action>
       <action context="Layout" dev="JM" type="fix">
         Fixed ID resolution for nested bookmarks with duplicated IDs.
       </action>