CVS: jfor/src/org/jfor/jfor/rtflib/rtfdoc RtfExternalGraphic.java,1.11,1.12

Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19473/rtflib/rtfdoc

Modified Files:
	RtfExternalGraphic.java 
Log Message:
removed use of picwgoal and pichgoal in scaled images - picscalex and picscaley suffice. improved results in external-graphics-test-20010821.

Index: RtfExternalGraphic.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfExternalGraphic.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RtfExternalGraphic.java	17 Jul 2003 14:07:31 -0000	1.11
--- RtfExternalGraphic.java	10 Feb 2004 04:59:01 -0000	1.12
***************
*** 343,355 ****
  		}
  
  		if (widthDesired != -1) {
  			if (perCentW) {
! 				writeControlWord("picscalex" + widthDesired);
  			}
  			else {
! 				writeControlWord("picscalex" + widthDesired * 100 / width);
  			}
- 
- 			writeControlWord("picwgoal" + widthDesired);
  		}
  		else if (scaleUniform && heightDesired != -1) {
--- 343,356 ----
  		}
  
+ 		// if target width/height is specified, specify the appropriate picscalex/y
+ 		// in percentage units (width/height may be in units, too)
+ 		// note we do not bother with picgoalw/h, as it is redundant and reportedly causes problems
  		if (widthDesired != -1) {
  			if (perCentW) {
! 			    writeControlWord("picscalex" + widthDesired);
  			}
  			else {
! 			    writeControlWord("picscalex" + widthDesired * 100 / width);
  			}
  		}
  		else if (scaleUniform && heightDesired != -1) {
***************
*** 364,374 ****
  		if (heightDesired != -1) {
  			if (perCentH) {
! 				writeControlWord("picscaley" + heightDesired);
  			}
  			else {
! 				writeControlWord("picscaley" + heightDesired * 100 / height);
  			}
  
- 			writeControlWord("pichgoal" + heightDesired);
  		}
  		else if (scaleUniform && widthDesired != -1) {
--- 365,374 ----
  		if (heightDesired != -1) {
  			if (perCentH) {
! 			    writeControlWord("picscaley" + heightDesired);
  			}
  			else {
! 			    writeControlWord("picscaley" + heightDesired * 100 / height);
  			}
  
  		}
  		else if (scaleUniform && widthDesired != -1) {



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn