CVS: jfor/src/org/jfor/jfor/converter TextAttributesConverter.java,1.8,1.9

Bertrand Delacretaz <[email protected]> Mon, 29 Jul 2002 07:21:13 -0700
Newsgroups gmane.text.xml.jfor.cvs
Message-ID <[email protected]>
Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/converter
In directory usw-pr-cvs1:/tmp/cvs-serv13604/src/org/jfor/jfor/converter

Modified Files:
	TextAttributesConverter.java 
Log Message:
bug corrected, not all unit values were handled for space-before and space-after

Index: TextAttributesConverter.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/converter/TextAttributesConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TextAttributesConverter.java	17 Jul 2002 18:12:28 -0000	1.8
--- TextAttributesConverter.java	29 Jul 2002 14:21:11 -0000	1.9
***************
*** 52,56 ****
   * Contributor(s):
   * @author Andreas Putz [email protected]
!  * Boris Poudérous [email protected]
  -----------------------------------------------------------------------------*/
  
--- 52,56 ----
   * Contributor(s):
   * @author Andreas Putz [email protected]
!  * @author Boris Poudérous [email protected]
  -----------------------------------------------------------------------------*/
  
***************
*** 63,66 ****
--- 63,69 ----
  // $Id$
  // $Log$
+ // Revision 1.9  2002/07/29 14:21:11  bdelacretaz
+ // bug corrected, not all unit values were handled for space-before and space-after
+ //
  // Revision 1.8  2002/07/17 18:12:28  rmarra
  // Contributions for background-color processing and
***************
*** 168,172 ****
  	    // Space before
  	    final String spaceBefore = AbstractBuilder.getAttribute(attrs,null,"space-before",false);
! 		if ( (spaceBefore != null) && (spaceBefore.endsWith("pt") || spaceBefore.endsWith("mm")) ) {
  	        if (result == null) result = new RtfAttributes();
  	  			result.set(RtfText.SPACE_BEFORE, (int)FoUnitsConverter.getInstance().convertToTwips(spaceBefore));
--- 171,175 ----
  	    // Space before
  	    final String spaceBefore = AbstractBuilder.getAttribute(attrs,null,"space-before",false);
! 		if (spaceBefore != null) {
  	        if (result == null) result = new RtfAttributes();
  	  			result.set(RtfText.SPACE_BEFORE, (int)FoUnitsConverter.getInstance().convertToTwips(spaceBefore));
***************
*** 178,183 ****
  	    // Space after
  	    final String spaceAfter = AbstractBuilder.getAttribute(attrs,null,"space-after",false);
! 		if ( (spaceAfter != null) && (spaceAfter.endsWith("pt") || spaceAfter.endsWith("mm")) ) 
! 	    {
  	      if (result == null) result = new RtfAttributes();
  	  	  result.set(RtfText.SPACE_AFTER, (int)FoUnitsConverter.getInstance().convertToTwips(spaceAfter));
--- 181,185 ----
  	    // Space after
  	    final String spaceAfter = AbstractBuilder.getAttribute(attrs,null,"space-after",false);
! 		if (spaceAfter != null) {
  	      if (result == null) result = new RtfAttributes();
  	  	  result.set(RtfText.SPACE_AFTER, (int)FoUnitsConverter.getInstance().convertToTwips(spaceAfter));



-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31