xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r679781 [28/34] - in /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ ...
Date Fri, 25 Jul 2008 12:46:22 GMT
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -158,7 +158,7 @@
             //The color currently does not exist, so add it to the table.
             //First add it, then read the size as index (to return it).
             //So the first added color gets index 1. That is OK, because
-            //index 0 is reserved for auto-colored. 
+            //index 0 is reserved for auto-colored.
             addColor (identifier);
 
             retVal = colorTable.size ();

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -97,7 +97,7 @@
     public void newLine() throws IOException {
         writer.write("\n");
     }
-    
+
     /**
      * Write an RTF control word to our Writer
      * @param word RTF control word to write
@@ -224,7 +224,7 @@
             writeControlWord(cw);
             writeAttributes((RtfAttributes) value, null);
             return;
-        }        
+        }
         writeControlWord(cw);
     }
 
@@ -246,7 +246,7 @@
             writeControlWord(cw);
             writeAttributes((RtfAttributes) value, null);
             return;
-        }        
+        }
         writeControlWordNS(cw);
     }
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -65,7 +65,7 @@
             super(reason);
         }
     }
-    
+
     //////////////////////////////////////////////////
     // Supported Formats
     //////////////////////////////////////////////////
@@ -83,7 +83,7 @@
         public static boolean isFormat(byte[] data) {
             return false;
         }
-        
+
         /**
          * Convert image data if necessary - for example when format is not supported by rtf.
          *
@@ -93,7 +93,7 @@
         public FormatBase convert(FormatBase format, byte[] data) {
             return format;
         }
-        
+
         /**
          * Determine image file format.
          *
@@ -118,7 +118,7 @@
                 return null;
             }
         }
-        
+
         /**
          * Get image type.
          *
@@ -127,7 +127,7 @@
         public int getType() {
             return ImageConstants.I_NOT_SUPPORTED;
         }
-        
+
         /**
          * Get rtf tag.
          *
@@ -137,7 +137,7 @@
             return "";
         }
     }
-    
+
     private static class FormatGIF extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "GIF8" on position 0
@@ -145,12 +145,12 @@
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_GIF;
         }
     }
-    
+
     private static class FormatEMF extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // No offical Indentifier known
@@ -158,28 +158,28 @@
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_EMF;
         }
-        
+
         public String getRtfTag() {
             return "emfblip";
         }
     }
-    
+
     private  static class FormatBMP extends FormatBase {
         public static boolean isFormat(byte[] data) {
             byte [] pattern = new byte [] {(byte) 0x42, (byte) 0x4D};
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_BMP;
         }
     }
-    
+
     private static class FormatJPG extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "0xFFD8" on position 0
@@ -187,16 +187,16 @@
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-      
+
         public int getType() {
             return ImageConstants.I_JPG;
         }
-        
+
         public String getRtfTag() {
             return "jpegblip";
         }
     }
-    
+
     private static class FormatPNG extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "PNG" on position 1
@@ -204,16 +204,16 @@
 
             return ImageUtil.compareHexValues(pattern, data, 1, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_PNG;
         }
-        
+
         public String getRtfTag() {
             return "pngblip";
         }
     }
-    
+
     //////////////////////////////////////////////////
     // @@ Members
     //////////////////////////////////////////////////
@@ -370,7 +370,7 @@
                 throw new ExternalGraphicException("The attribute 'src' of "
                         + "<fo:external-graphic> has a invalid value: '"
                         + url + "' (" + e + ")");
-            }            
+            }
         }
 
         if (imagedata == null) {
@@ -383,8 +383,8 @@
         if (imageformat != null) {
             imageformat = imageformat.convert(imageformat, imagedata);
         }
-        
-        if (imageformat == null 
+
+        if (imageformat == null
                 || imageformat.getType() == ImageConstants.I_NOT_SUPPORTED
                 || "".equals(imageformat.getRtfTag())) {
             throw new ExternalGraphicException("The tag <fo:external-graphic> "
@@ -465,17 +465,17 @@
             }
         } else if (imageformat.getType() == ImageConstants.I_EMF) {
             int i = 0;
-            
+
             i = ImageUtil.getIntFromByteArray(imagedata, 151, 4, false);
             if (i != 0 ) {
-                width = i; 
+                width = i;
             }
-            
+
             i = ImageUtil.getIntFromByteArray(imagedata, 155, 4, false);
             if (i != 0 ) {
                 height = i;
             }
-            
+
         }
     }
 
@@ -557,7 +557,7 @@
             this.scaleUniform = true;
         }
     }
-    
+
     /**
      * Sets the binary imagedata of the image.
      *

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -109,7 +109,7 @@
 
         return listTable;
     }
-    
+
     /**
      * Get the list table.
      * @return the RtfListTable

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -169,7 +169,7 @@
     private String getFontKey(String family) {
         return family.toLowerCase();
     }
-    
+
     /**
      * Adds a font to the table.
      *

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
         if (bBody) {
             RtfTextrun textrun = RtfTextrun.getTextrun(body, writer, null);
             textrun.setSuppressLastPar(true);
-            
+
             return textrun;
         } else {
             return textrunInline;
@@ -62,16 +62,16 @@
     */
     protected void writeRtfContent() throws IOException {
         textrunInline.writeRtfContent();
-        
+
         writeGroupMark(true);
         writeControlWord("footnote");
-        writeControlWord("ftnalt");      
-        
+        writeControlWord("ftnalt");
+
         body.writeRtfContent();
-        
+
         writeGroupMark(false);
     }
-    
+
     public RtfList newList(RtfAttributes attrs) throws IOException {
         if (list != null) {
             list.close();
@@ -81,11 +81,11 @@
 
         return list;
     }
-    
+
     public void startBody() {
         bBody = true;
     }
-    
+
     public void endBody() {
         bBody = false;
     }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
     public RtfGenerator(RtfHeader h, Writer w) throws IOException {
         super(h, w);
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,7 +60,7 @@
         RtfTemplate.getInstance().writeTemplate(this);
         RtfStyleSheetTable.getInstance().writeStyleSheet(this);
         writeFootnoteProperties();
-        
+
     }
 
     /** write user properties if any */

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,7 +70,7 @@
         super ((RtfContainer) parent, writer, attr);
         new RtfText (this, writer, str, attr);
     }
-    
+
     public RtfHyperLink (RtfTextrun parent, Writer writer, RtfAttributes attr)
         throws IOException {
         super ((RtfContainer) parent, writer, attr);
@@ -216,7 +216,7 @@
     public boolean isEmpty () {
         return false;
     }
-    
+
     public RtfTextrun getTextrun()
     throws IOException {
         RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, null);

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,7 +60,7 @@
 
         // find out if we are nested in a table
         hasTableParent = this.getParentOfClass(RtfTable.class) != null;
-        
+
         this.setRtfListStyle(new RtfListStyleBullet());
     }
 
@@ -84,7 +84,7 @@
     public Integer getListId() {
         return listId;
     }
-    
+
     /**
      * Returns the Id of the list template.
      * @return Id of the list template
@@ -92,7 +92,7 @@
     public Integer getListTemplateId() {
         return listTemplateId;
     }
-    
+
     /**
      * Change list style
      * @param ls ListStyle to set
@@ -108,7 +108,7 @@
     public RtfListStyle getRtfListStyle() {
         return defaultListStyle;
     }
-    
+
     /**
      * Returns true, if the list has a parent table.
      * @return true, if the list has a parent table

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@
     private RtfListStyle listStyle;
     private int number = 0;
 
-    /** 
+    /**
      * special RtfParagraph that writes list item setup code before its content
      */
     private class RtfListItemParagraph extends RtfParagraph {
@@ -61,21 +61,21 @@
         }
     }
 
-    /** 
+    /**
      * special RtfTextrun that is used as list item label
      */
     public class RtfListItemLabel extends RtfTextrun implements IRtfTextrunContainer {
-        
+
         private RtfListItem rtfListItem;
-        
+
         /**
          * Constructs the RtfListItemLabel
          * @param item The RtfListItem the label belongs to
          * @throws IOException Thrown when an IO-problem occurs
          */
         public RtfListItemLabel(RtfListItem item) throws IOException {
-            super(null, item.writer, null); 
-            
+            super(null, item.writer, null);
+
             rtfListItem = item;
         }
 
@@ -88,14 +88,14 @@
         public RtfTextrun getTextrun() throws IOException {
             return this;
         }
-        
+
         /**
          * Sets the content of the list item label.
          * @param s Content of the list item label.
          * @throws IOException Thrown when an IO-problem occurs
          */
         public void addString(String s) throws IOException {
-            
+
             final String label = s.trim();
             if (label.length() > 0 && Character.isDigit(label.charAt(0))) {
                 rtfListItem.setRtfListStyle(new RtfListStyleNumber());
@@ -151,7 +151,7 @@
         textrun.setRtfListItem(this);
         return textrun;
     }
-    
+
     /**
      * Start a new list after closing current paragraph, list and table
      * @param attrs attributes of new RftList object
@@ -162,22 +162,22 @@
         RtfList list = new RtfList(this, writer, attrs);
         return list;
     }
-    
+
     /**
      * Overridden to setup the list: start a group with appropriate attributes
      * @throws IOException for I/O problems
      */
     protected void writeRtfPrefix() throws IOException {
-       
+
         // pard causes word97 (and sometimes 2000 too) to crash if the list is nested in a table
         if (!parentList.getHasTableParent()) {
             writeControlWord("pard");
         }
 
-        writeOneAttribute(RtfText.LEFT_INDENT_FIRST, 
+        writeOneAttribute(RtfText.LEFT_INDENT_FIRST,
                 "360"); //attrib.getValue(RtfListTable.LIST_INDENT));
-            
-        writeOneAttribute(RtfText.LEFT_INDENT_BODY, 
+
+        writeOneAttribute(RtfText.LEFT_INDENT_BODY,
                 attrib.getValue(RtfText.LEFT_INDENT_BODY));
 
         // group for list setup info
@@ -191,7 +191,7 @@
         writeGroupMark(false);
         writeOneAttribute(RtfListTable.LIST_NUMBER, new Integer(number));
     }
-    
+
     /**
      * End the list group
      * @throws IOException for I/O problems
@@ -202,20 +202,20 @@
         /* reset paragraph defaults to make sure list ends
          * but pard causes word97 (and sometimes 2000 too) to crash if the list
          * is nested in a table
-         */ 
+         */
         if (!parentList.getHasTableParent()) {
             writeControlWord("pard");
         }
-        
+
     }
-       
+
     /**
      * Change list style
      * @param ls ListStyle to set
      */
     public void setRtfListStyle(RtfListStyle ls) {
         listStyle = ls;
-        
+
         listStyle.setRtfListItem(this);
         number = getRtfFile().getListTable().addRtfListStyle(ls);
     }
@@ -223,7 +223,7 @@
     /**
      * Get list style
      * @return ListSytle of the List
-     */    
+     */
     public RtfListStyle getRtfListStyle() {
         if (listStyle == null) {
             return parentList.getRtfListStyle();
@@ -231,7 +231,7 @@
             return listStyle;
         }
     }
-    
+
     /**
      * Get the parent list.
      * @return the parent list
@@ -239,7 +239,7 @@
     public RtfList getParentList() {
         return parentList;
     }
-    
+
     /**
      * Returns the list number
      * @return list number

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
  */
 public class RtfListStyle {
     private RtfListItem rtfListItem;
-    
+
     /**
      * Sets the RtfListItem this style belongs to.
      * @param item RtfListItem this style belongs to
@@ -45,7 +45,7 @@
     public void setRtfListItem(RtfListItem item) {
         rtfListItem = item;
     }
-    
+
     /**
      * Gets the RtfListItem this style belongs to.
      * @return RtfListItem this style belongs to
@@ -83,7 +83,7 @@
      * Gets called when the list table has to be written.
      * @param element RtfElement in whose context is to be written
      * @throws IOException Thrown when an IO-problem occurs.
-     */        
+     */
     public void writeLevelGroup(RtfElement element)
     throws IOException {
     }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
  * Class to handle bullet list style.
  */
 public class RtfListStyleBullet extends RtfListStyle {
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -73,7 +73,7 @@
 
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -83,12 +83,12 @@
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_TEXT_FORM, "\\'01\\'b7");
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_NUM_POSITION, null);
         element.writeGroupMark(false);
-            
+
         element.attrib.set(RtfListTable.LIST_FONT_TYPE, 2);
     }
-       
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
  * Class to handle number list style.
  */
 public class RtfListStyleNumber extends RtfListStyle {
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -54,10 +54,10 @@
                 item.attrib.getValue(RtfListTable.LIST_INDENT));
         item.writeControlWord("pntxta.");
     }
-    
+
     /**
      * Gets called before a paragraph, which is contained by a RtfListItem has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -71,10 +71,10 @@
         element.writeControlWord("tab");
         element.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -84,17 +84,17 @@
         element.writeOneAttributeNS(
                 RtfListTable.LIST_START_AT, new Integer(1));
         element.attrib.set(RtfListTable.LIST_NUMBER_TYPE, 0);
-        
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(
                 RtfListTable.LIST_TEXT_FORM, "\\'03\\\'00. ;");
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(
                 RtfListTable.LIST_NUM_POSITION, "\\'01;");
         element.writeGroupMark(false);
-            
+
         element.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, new Integer(0));
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,15 +37,15 @@
  */
 public class RtfListStyleText extends RtfListStyle {
     private String text;
-    
+
     /**
      * Constructs a RtfListStyleText object.
      * @param s Text to be displayed
      */
     public RtfListStyleText(String s) {
-        text = s;    
+        text = s;
     }
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -68,10 +68,10 @@
         RtfStringConverter.getInstance().writeRtfString(item.writer, text);
         item.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called before a paragraph, which is contained by a RtfListItem has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -82,10 +82,10 @@
         element.writeControlWord("pntext");
         element.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -94,7 +94,7 @@
     throws IOException {
         element.attrib.set(RtfListTable.LIST_NUMBER_TYPE, 23);
         element.writeGroupMark(true);
-        
+
         String sCount;
         if (text.length() < 10) {
             sCount = "0" + String.valueOf(text.length());
@@ -105,14 +105,14 @@
             }
         }
         element.writeOneAttributeNS(
-                RtfListTable.LIST_TEXT_FORM, "\\'" + sCount 
+                RtfListTable.LIST_TEXT_FORM, "\\'" + sCount
                     + RtfStringConverter.getInstance().escape(text));
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_NUM_POSITION, null);
         element.writeGroupMark(false);
-            
+
         element.attrib.set(RtfListTable.LIST_FONT_TYPE, 2);
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -119,7 +119,7 @@
         }
 
         lists.add(list);
-        
+
         return lists.size();
     }
 
@@ -140,7 +140,7 @@
                 newLine();
             }
             writeGroupMark(false);
-               
+
             newLine();
             //write '\listoveridetable'
             writeGroupMark(true);
@@ -149,11 +149,11 @@
             newLine();
             for (Iterator it = styles.iterator(); it.hasNext();) {
                 final RtfListStyle style = (RtfListStyle)it.next();
-                        
+
                 writeGroupMark(true);
                 writeStarControlWordNS(LIST_OVR);
                 writeGroupMark(true);
-        
+
                 writeOneAttributeNS(LIST_ID, style.getRtfList().getListId().toString());
                 writeOneAttributeNS(LIST_OVR_COUNT, new Integer(0));
                 writeOneAttributeNS(LIST_NUMBER, new Integer(z++));
@@ -162,7 +162,7 @@
                 writeGroupMark(false);
                 newLine();
             }
-            
+
             writeGroupMark(false);
             newLine();
         }
@@ -176,7 +176,7 @@
     public boolean isEmpty() {
         return false;
     }
-    
+
     private void writeListTableEntry(RtfList list)
     throws IOException {
         //write list-specific attributes
@@ -184,29 +184,29 @@
         writeControlWordNS(LIST);
         writeOneAttributeNS(LIST_TEMPLATE_ID, list.getListTemplateId().toString());
         writeOneAttributeNS(LIST, attrib.getValue(LIST));
-        
+
         // write level-specific attributes
         writeGroupMark(true);
         writeControlWordNS(LIST_LEVEL);
-        
+
         writeOneAttributeNS(LIST_JUSTIFICATION, attrib.getValue(LIST_JUSTIFICATION));
         writeOneAttributeNS(LIST_FOLLOWING_CHAR, attrib.getValue(LIST_FOLLOWING_CHAR));
         writeOneAttributeNS(LIST_SPACE, new Integer(0));
         writeOneAttributeNS(LIST_INDENT, attrib.getValue(LIST_INDENT));
-        
+
         RtfListItem item = (RtfListItem)list.getChildren().get(0);
         if (item != null) {
             item.getRtfListStyle().writeLevelGroup(this);
         }
-        
+
         writeGroupMark(false);
-        
+
         writeGroupMark(true);
         writeControlWordNS(LIST_NAME);
         writeGroupMark(false);
-        
+
         writeOneAttributeNS(LIST_ID, list.getListId().toString());
-                
+
         writeGroupMark(false);
     }
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@
     public static final String MARGIN_LEFT = "margl";
     /** constant for right margin */
     public static final String MARGIN_RIGHT = "margr";
-    
+
     /** constant for header position */
     public static final String HEADERY = "headery";
     /** constant for footer position */

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -78,8 +78,8 @@
             // Build page reference field
             String pageRef = RTF_FIELD_PAGEREF_MODEL;
             final int insertionIndex = pageRef.indexOf("}");
-            pageRef = pageRef.substring(0, insertionIndex) 
-                + "\"" + id 
+            pageRef = pageRef.substring(0, insertionIndex)
+                + "\"" + id
                 + "\"" + " "
                 + pageRef.substring(insertionIndex, pageRef.length());
             id = null;

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -231,7 +231,7 @@
         closeCurrentExternalGraphic();
         closeCurrentBefore();
     }
-    
+
     /**
      * Returns the current RtfTextrun.
      * @return Current RtfTextrun

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java Fri Jul 25 05:44:20 2008
@@ -23,8 +23,8 @@
 import java.util.LinkedList;
 
 /**
- * This class is responsible for saving space-before/space-after attributes 
- * history and adding spacing to established candidates (i.e. attributes) or 
+ * This class is responsible for saving space-before/space-after attributes
+ * history and adding spacing to established candidates (i.e. attributes) or
  * accumulation spacing in case of candidate absence.
  */
 public class RtfSpaceManager {
@@ -41,7 +41,7 @@
      * property.
      */
     private int accumulatedSpace = 0;
-    
+
     /**
      * Construct a newly allocated <code>RtfSpaceManager</code> object.
      */
@@ -49,8 +49,8 @@
     }
 
     /**
-     * Iterates block-level stack (i.e. all open blocks) and stops updating 
-     * candidate for adding space-before/space-after attribute in case of 
+     * Iterates block-level stack (i.e. all open blocks) and stops updating
+     * candidate for adding space-before/space-after attribute in case of
      * candidate presence.
      */
     public void stopUpdatingSpaceBefore() {
@@ -61,10 +61,10 @@
             }
         }
     }
-    
+
     /**
      * Set attributes as candidate for space attributes inheritance.
-     * 
+     *
      * @param attrs  attributes to set
      */
     public void setCandidate(RtfAttributes attrs) {
@@ -74,24 +74,24 @@
             splitter.setSpaceAfterCandidate(attrs);
         }
     }
-    
+
     /**
-     * Builds RtfSpaceSplitter on <code>attrs</code> and adds it to the 
+     * Builds RtfSpaceSplitter on <code>attrs</code> and adds it to the
      * block-level stack.
-     * 
+     *
      * @param attrs  RtfAttribute to add
      * @return instance of RtfSpaceSplitter
      */
     public RtfSpaceSplitter pushRtfSpaceSplitter(RtfAttributes attrs) {
         RtfSpaceSplitter splitter;
         splitter = new RtfSpaceSplitter(attrs, accumulatedSpace);
-        // set accumulatedSpace to 0, because now accumulatedSpace used 
+        // set accumulatedSpace to 0, because now accumulatedSpace used
         // in splitter
         accumulatedSpace = 0;
         blockAttributes.addLast(splitter);
         return splitter;
     }
-    
+
     /**
      * Removes RtfSpaceSplitter from top of block-level stack.
      */
@@ -105,7 +105,7 @@
 
     /**
      * Pushes inline attributes to inline-level stack.
-     * 
+     *
      * @param attrs attributes to add
      */
     public void pushInlineAttributes(RtfAttributes attrs) {
@@ -123,7 +123,7 @@
 
     /**
      * Peeks at inline-level attribute stack.
-     * 
+     *
      * @return RtfAttributes from top of inline-level stack
      */
     public RtfAttributes getLastInlineAttribute() {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java Fri Jul 25 05:44:20 2008
@@ -45,7 +45,7 @@
 
     /**
      * Create RtfSpaceSplitter with given RtfAttributes.
-     * 
+     *
      * @param attrs  RtfAttributes for splitting
      * @param previousSpace  integer, representing accumulated spacing
      */
@@ -62,7 +62,7 @@
     /**
      * Remove attributes with name <code>key</code> from
      * <code>commonAttributes</code> and return it as int.
-     * 
+     *
      * @param key  attributes name to extract
      * @return integer, representing value of extracted attributes
      */
@@ -86,10 +86,10 @@
         return spaceBefore;
     }
 
-    /** 
+    /**
      * Sets a candidate for space-before property.
-     * 
-     * @param candidate  instance of <code>RtfAttributes</code>, considered as 
+     *
+     * @param candidate  instance of <code>RtfAttributes</code>, considered as
      *        a candidate for space-before adding
      */
     public void setSpaceBeforeCandidate(RtfAttributes candidate) {
@@ -98,10 +98,10 @@
         }
     }
 
-    /** 
+    /**
      * Sets a candidate for space-after property.
-     * 
-     * @param candidate  instance of <code>RtfAttributes</code>, considered as 
+     *
+     * @param candidate  instance of <code>RtfAttributes</code>, considered as
      *        a candidate for space-after adding
      */
     public void setSpaceAfterCandidate(RtfAttributes candidate) {
@@ -117,19 +117,19 @@
     public boolean isAfterCadidateSet() {
         return spaceAfterCandidate != null;
     }
-    
+
     /**
      * Stops updating candidates for space-before attribute.
      */
     public void stopUpdatingSpaceBefore() {
         updatingSpaceBefore = false;
-    } 
+    }
 
     /**
      * Adds corresponding attributes to their candidates.
-     * 
-     * @return integer, representing value of space-before/space-after 
-     *   attributes, that can't be added anywhere (i.e. these attributes 
+     *
+     * @return integer, representing value of space-before/space-after
+     *   attributes, that can't be added anywhere (i.e. these attributes
      *   hasn't their candidates)
      */
     public int flush() {
@@ -144,7 +144,7 @@
         if (!isAfterCadidateSet()) {
             accumulatingSpace += spaceAfter;
         } else {
-            spaceAfterCandidate.addIntegerValue(spaceAfter, 
+            spaceAfterCandidate.addIntegerValue(spaceAfter,
                             RtfText.SPACE_AFTER);
         }
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
 
 public class RtfString extends RtfElement {
     private String text = "";
-        
+
     RtfString(RtfContainer parent, Writer w, String s)
     throws IOException {
         super(parent, w);
-            
+
         text = s;
     }
-        
+
     /**
     * @return true if this element would generate no "useful" RTF content
     */
     public boolean isEmpty() {
         return text.trim().equals("");
     }
-        
+
     /**
     * write RTF code of all our children
     * @throws IOException for I/O problems
@@ -58,11 +58,11 @@
     protected void writeRtfContent() throws IOException {
         RtfStringConverter.getInstance().writeRtfString(writer, text);
     }
-        
+
     public String getText() {
         return text;
     }
-        
+
     public void setText(String s) {
         text = s;
     }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -132,5 +132,5 @@
         }
         return sb.toString();
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -110,16 +110,16 @@
             writeControlWordNS("pard");
         }
 
-        writeGroupMark(true);   
+        writeGroupMark(true);
     }
-    
+
     /**
      * Overridden to write RTF suffix code, what comes after our children
      * @throws IOException for I/O problems
      */
     protected void writeRtfSuffix() throws IOException {
         writeGroupMark(false);
-        
+
         if (isNestedTable()) {
             getRow().writeRowAndCellsDefintions();
         }
@@ -154,7 +154,7 @@
     }
 
     /**
-     * 
+     *
      * @return RtfAttributes of Header
      */
     public RtfAttributes getHeaderAttribs() {
@@ -173,7 +173,7 @@
 
         return super.getRtfAttributes();
     }
-    
+
     /** @return true if the the table is a nested table */
     public boolean isNestedTable() {
         if (isNestedTable == null) {
@@ -194,9 +194,9 @@
 
         return false;
     }
-    
+
     /**
-     * 
+     *
      * @return Parent row table (for nested tables only)
      */
     public RtfTableRow getRow() {
@@ -209,7 +209,7 @@
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 
     /**
@@ -219,7 +219,7 @@
     public void setBorderAttributes(RtfAttributes attributes) {
         borderAttributes = attributes;
     }
-    
+
     /**
      * Returns the RtfAttributes for the borders of the table.
      * @return Border attributes of the table.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -100,7 +100,7 @@
         if (attrs == null) {
             attrs = new RtfAttributes();
         }
-        
+
         attrs.set("intbl");
 
         paragraph = new RtfParagraph(this, writer, attrs);
@@ -192,13 +192,13 @@
          * table (Word2000 seems to do the same).
          * Cause of this, dont't write horizontally merged cells.
          * They just exist as placeholders in TableContext class,
-         * and are never written to RTF file.    
+         * and are never written to RTF file.
          */
         // horizontal cell merge codes
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return offset;
         }
-        
+
         newLine();
         this.widthOffset = offset;
 
@@ -225,13 +225,13 @@
         if (attrib.getValue("number-columns-spanned") != null) {
             // Get the number of columns spanned
             int nbMergedCells = ((Integer)attrib.getValue("number-columns-spanned")).intValue();
-            
+
             RtfTable tab = getRow().getTable();
-            
+
             // Get the context of the current table in order to get the width of each column
             ITableColumnsInfo tableColumnsInfo
                 = tab.getITableColumnsInfo();
-            
+
             tableColumnsInfo.selectFirstColumn();
 
             // Reach the column index in table context corresponding to the current column cell
@@ -273,7 +273,7 @@
         return xPos;
 
     }
-    
+
     /**
      * Overriden to avoid writing any it's a merged cell.
      * @throws IOException for I/O problems
@@ -283,7 +283,7 @@
        if (hMerge == MERGE_WITH_PREVIOUS) {
            return;
        }
-       
+
        super.writeRtfContent();
     }
 
@@ -297,7 +297,7 @@
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return;
         }
-        
+
         super.writeRtfPrefix();
     }
 
@@ -310,7 +310,7 @@
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return;
         }
-        
+
         if (getRow().getTable().isNestedTable()) {
             //nested table
             writeControlWordNS("nestcell");
@@ -330,19 +330,19 @@
                 writeControlWord("qr");
             } else {
                 RtfElement lastChild = null;
-                
+
                 if (getChildren().size() > 0) {
                     lastChild = (RtfElement) getChildren().get(getChildren().size() - 1);
                 }
-                    
-                
+
+
                 if (lastChild != null
                         && lastChild instanceof RtfTextrun) {
-                    //Don't write \ql in order to allow for example a right aligned paragraph 
+                    //Don't write \ql in order to allow for example a right aligned paragraph
                     //in a not right aligned table-cell to write its \qr.
                 } else {
                     writeControlWord("ql");
-                }                
+                }
             }
 
             if (!containsText()) {
@@ -497,7 +497,7 @@
         }
         return result;
     }
-    
+
     /**
      * Returns the current RtfTextrun object.
      * Opens a new one if necessary.
@@ -506,20 +506,20 @@
      */
     public RtfTextrun getTextrun() throws IOException {
         RtfAttributes attrs = new RtfAttributes();
-        
+
         if (!getRow().getTable().isNestedTable()) {
             attrs.set("intbl");
         }
-        
+
         RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, attrs);
 
         //Suppress the very last \par, because the closing \cell applies the
-        //paragraph attributes. 
-        textrun.setSuppressLastPar(true);  
-        
+        //paragraph attributes.
+        textrun.setSuppressLastPar(true);
+
         return textrun;
     }
-    
+
     /**
      * Get the parent row.
      * @return The parent row.
@@ -534,6 +534,6 @@
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -145,15 +145,15 @@
         // now children can write themselves, we have the correct RTF prefix code
         super.writeRtfContent();
     }
-    
+
     /**
-     * 
+     *
      * @throws IOException In case of a IO-problem
      */
     public void writeRowAndCellsDefintions() throws IOException {
         // render the row and cells definitions
         writeControlWord("trowd");
-        
+
         if (!getTable().isNestedTable()) {
             writeControlWord("itap0");
         }
@@ -181,24 +181,24 @@
 
         // write X positions of our cells
         int xPos = 0;
-        
+
         final Object leftIndent = attrib.getValue(ITableAttributes.ATTR_ROW_LEFT_INDENT);
         if (leftIndent != null) {
             xPos = ((Integer)leftIndent).intValue();
         }
-        
+
         RtfAttributes tableBorderAttributes = getTable().getBorderAttributes();
-        
+
         int index = 0;
         for (Iterator it = getChildren().iterator(); it.hasNext();) {
             final RtfElement e = (RtfElement)it.next();
             if (e instanceof RtfTableCell) {
-                
+
                 RtfTableCell rtfcell = (RtfTableCell)e;
-                
+
                 // Adjust the cell's display attributes so the table's/row's borders
                 // are drawn properly.
-                
+
                 if (tableBorderAttributes != null) {
                     // get border attributes from table
                     if (index == 0) {
@@ -233,7 +233,7 @@
                         }
                     }
                 }
-                
+
                 // get border attributes from row
                 if (index == 0) {
                     if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_LEFT)) {
@@ -268,7 +268,7 @@
             }
           index++; // Added by Boris POUDEROUS on 2002/07/02
         }
-        
+
         newLine();
     }
 
@@ -366,9 +366,9 @@
     public boolean isHighestCell(int cellId) {
         return (highestCell == cellId) ? true : false;
     }
-    
+
     /**
-     * 
+     *
      * @return Parent table of the row.
      */
     public RtfTable getTable() {
@@ -381,6 +381,6 @@
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -79,7 +79,7 @@
     /** RtfText attributes: paragraph shading attributes */
     /** Constant for the shading of the paragraph */
     public static final String SHADING = "shading";
-    /** Constant for the document's color tableshading of the paragraph */    
+    /** Constant for the document's color tableshading of the paragraph */
     public static final String SHADING_FRONT_COLOR = "cfpat";
     /** Constant for the 100% shading of the paragraph */
     public static final int FULL_SHADING = 10000;



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message