fixes small bug with the link rectangle placement when the link

is using text-indent

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193450 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 6540ed2c659f55cea2150b39aeb8c18847803c8e..edfbee2d17815a72e16738a2da2fc47006d60730 100644 (file)
--- a/src/org/apache/fop/layout/LineArea.java
+++ b/src/org/apache/fop/layout/LineArea.java
@@ -224,8 +224,7 @@ public class LineArea extends Area {
                        InlineArea inlineArea = (InlineArea) e.nextElement();
                        if (ls != null) {
                            Rectangle lr =
-                               new Rectangle(startIndent +
-                                             finalWidth,
+                               new Rectangle(finalWidth,
                                              0,
                                              inlineArea.getContentWidth(),
                                              fontState.getFontSize());
@@ -252,8 +251,7 @@ public class LineArea extends Area {
                        addChild(ia);
                        if (ls != null) {
                            Rectangle lr =
-                               new Rectangle(startIndent +
-                                             finalWidth,
+                               new Rectangle(finalWidth,
                                              0,
                                              ia.getContentWidth(),
                                              fontState.getFontSize());                            
@@ -360,7 +358,7 @@ public class LineArea extends Area {
            
            if (ls != null) {
                Rectangle lr =
-                   new Rectangle(startIndent + finalWidth + spaceWidth + embeddedLinkStart,
+                   new Rectangle(finalWidth + spaceWidth + embeddedLinkStart,
                                  spaceWidth,
                                  pia.getContentWidth(),
                                  fontState.getFontSize());                             

diff --git a/src/org/apache/fop/layout/LinkSet.java b/src/org/apache/fop/layout/LinkSet.java
index 67155d0f039eff268b861a461d5d9a0cafd7a925..3277899a0ff12f78dbd4a48237ac0109f4d94871 100644 (file)
--- a/src/org/apache/fop/layout/LinkSet.java
+++ b/src/org/apache/fop/layout/LinkSet.java
@@ -135,7 +135,7 @@ public class LinkSet {
         Enumeration re = rects.elements();                 
         while (re.hasMoreElements()) {
            LinkedRectangle r = (LinkedRectangle)re.nextElement();
-            r.setX(r.getX() + ac.getXPosition() + area.getTableCellXOffset() - ba.startIndent);             
+            r.setX(r.getX() + ac.getXPosition() + area.getTableCellXOffset());             
             r.setY( ac.getYPosition() - height +(maxY-r.getY()) - ba.getHalfLeading());                    
          }
     }