keiron 02/05/29 06:53:41 Modified: src/org/apache/fop/svg PDFANode.java PDFGraphics2D.java Log: fixed link problem, now handles external properly Revision Changes Path 1.6 +2 -1 xml-fop/src/org/apache/fop/svg/PDFANode.java Index: PDFANode.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFANode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PDFANode.java 24 Sep 2001 07:31:52 -0000 1.5 +++ PDFANode.java 29 May 2002 13:53:41 -0000 1.6 @@ -1,5 +1,5 @@ /* - * $Id: PDFANode.java,v 1.5 2001/09/24 07:31:52 keiron Exp $ + * $Id: PDFANode.java,v 1.6 2002/05/29 13:53:41 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -58,6 +58,7 @@ int type = org.apache.fop.layout.LinkSet.EXTERNAL; Shape outline = getOutline(); if(destination.startsWith("#svgView(viewBox(")) { + type = org.apache.fop.layout.LinkSet.INTERNAL; String nums = destination.substring(18, destination.length() - 2); float x = 0; float y = 0; 1.27 +3 -3 xml-fop/src/org/apache/fop/svg/PDFGraphics2D.java Index: PDFGraphics2D.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFGraphics2D.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- PDFGraphics2D.java 22 May 2002 08:16:19 -0000 1.26 +++ PDFGraphics2D.java 29 May 2002 13:53:41 -0000 1.27 @@ -1,5 +1,5 @@ /* - * $Id: PDFGraphics2D.java,v 1.26 2002/05/22 08:16:19 keiron Exp $ + * $Id: PDFGraphics2D.java,v 1.27 2002/05/29 13:53:41 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -41,7 +41,7 @@ * This takes a pdf document and draws into it. * * @author <a href="mailto:[EMAIL PROTECTED]">Keiron Liddle</a> - * @version $Id: PDFGraphics2D.java,v 1.26 2002/05/22 08:16:19 keiron Exp $ + * @version $Id: PDFGraphics2D.java,v 1.27 2002/05/29 13:53:41 keiron Exp $ * @see org.apache.batik.ext.awt.g2d.AbstractGraphics2D */ public class PDFGraphics2D extends AbstractGraphics2D { @@ -171,7 +171,7 @@ rect.y = rect.y * 1000; rect.height = -rect.height * 1000; rect.width = rect.width * 1000; - if(linkType == LinkSet.EXTERNAL) { + if(linkType != LinkSet.EXTERNAL) { String pdfdest = "/XYZ " + dest; currentAnnotList.addLink(pdfDoc.makeLinkCurrentPage(rect, pdfdest)); } else {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]