pherweg 2004/01/27 09:33:27
Modified: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
RtfTextrun.java RtfParagraph.java
Log:
Removed call of JFOR's WhiteSpaceCollapser; now this is done by FOP
Revision Changes Path
1.9 +4 -11
xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
Index: RtfTextrun.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RtfTextrun.java 10 Jan 2004 19:43:58 -0000 1.8
+++ RtfTextrun.java 27 Jan 2004 17:33:27 -0000 1.9
@@ -228,19 +228,12 @@
*/
protected void writeRtfContent() throws IOException {
/**
- *TODO: The textrun's children are iterated threetimes:
- * 1. In WhitespaceCollapser
- * 2. To determine the last RtfParagraphBreak
- * 3. To write the children
+ *TODO: The textrun's children are iterated twice:
+ * 1. To determine the last RtfParagraphBreak
+ * 2. To write the children
* Maybe this can be done more efficient.
*/
-
- if (attrib != null && attrib.isSet("WhiteSpaceFalse")) {
- attrib.unset("WhiteSpaceFalse");
- } else {
- new WhitespaceCollapser(this);
- }
-
+
//determine, if this RtfTextrun is the last child of its parent
boolean bLast = false;
for (Iterator it = parent.getChildren().iterator(); it.hasNext();) {
1.3 +1 -8
xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
Index: RtfParagraph.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfParagraph.java 8 Nov 2003 19:58:03 -0000 1.2
+++ RtfParagraph.java 27 Jan 2004 17:33:27 -0000 1.3
@@ -136,13 +136,6 @@
* @throws IOException for I/O problems
*/
protected void writeRtfPrefix() throws IOException {
- // collapse whitespace before writing out
- // TODO could be made configurable
- if (attrib != null && attrib.isSet("WhiteSpaceFalse")) {
- attrib.unset("WhiteSpaceFalse");
- } else {
- new WhitespaceCollapser(this);
- }
//Reset paragraph properties if needed
if (resetProperties) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
