aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/layoutmgr/inline
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2006-04-10 07:41:16 +0000
committerJeremias Maerki <jeremias@apache.org>2006-04-10 07:41:16 +0000
commit8b761e244b7a703dcc582542d50ba30b6b845ed4 (patch)
treed17ed1c608a8c06c3c618268f57d3442111d83b1 /src/java/org/apache/fop/layoutmgr/inline
parent2569a6d829991a2aebad001df2447483d44e1d9b (diff)
downloadxmlgraphics-fop-8b761e244b7a703dcc582542d50ba30b6b845ed4.tar.gz
xmlgraphics-fop-8b761e244b7a703dcc582542d50ba30b6b845ed4.zip
Bugfix: Allow URLs in basic-link's external-destination to be wrapped in "url()".
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@392902 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/inline')
-rw-r--r--src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
index 0309e0c4c..429261f6f 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.inline;
+import org.apache.fop.datatypes.URISpecification;
import org.apache.fop.fo.flow.BasicLink;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.area.inline.InlineArea;
@@ -41,6 +42,7 @@ public class BasicLinkLayoutManager extends InlineLayoutManager {
fobj = node;
}
+ /** @see org.apache.fop.layoutmgr.inline.InlineLayoutManager#createArea(boolean) */
protected InlineArea createArea(boolean bInlineParent) {
InlineArea area = super.createArea(bInlineParent);
setupBasicLinkArea(parentLM, area);
@@ -50,7 +52,8 @@ public class BasicLinkLayoutManager extends InlineLayoutManager {
private void setupBasicLinkArea(LayoutManager parentLM,
InlineArea area) {
if (fobj.getExternalDestination() != null) {
- area.addTrait(Trait.EXTERNAL_LINK, fobj.getExternalDestination());
+ area.addTrait(Trait.EXTERNAL_LINK,
+ URISpecification.getURL(fobj.getExternalDestination()));
} else {
String idref = fobj.getInternalDestination();
PageViewport page = getPSLM().getFirstPVWithID(idref);