summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJay Bryant <jbryant@apache.org>2007-04-01 14:49:12 +0000
committerJay Bryant <jbryant@apache.org>2007-04-01 14:49:12 +0000
commit0622ab87fa8f8506221b6f09f1e1e9a58de7dac6 (patch)
treeba7482d836dff027a4fd0852836cc98a1041d5ef /src
parentb95c8c02da88175ed295d94637591baaed8edf8f (diff)
downloadxmlgraphics-fop-0622ab87fa8f8506221b6f09f1e1e9a58de7dac6.tar.gz
xmlgraphics-fop-0622ab87fa8f8506221b6f09f1e1e9a58de7dac6.zip
changes to support named destination
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@524603 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/fo/flow/Block.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 48a8d3bdf..5dc5ee67c 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -296,8 +296,11 @@ public class Block extends FObjMixed {
* fo:inline-container."
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
- throws ValidationException {
- if (FO_URI.equals(nsURI) && localName.equals("marker")) {
+ throws ValidationException
+ {
+ if (FOX_URI.equals(nsURI) && localName.equals("destination")) {
+ // Found a fox:destination element - ignore it
+ } else if (FO_URI.equals(nsURI) && localName.equals("marker")) {
if (blockOrInlineItemFound || initialPropertySetFound) {
nodesOutOfOrderError(loc, "fo:marker",
"initial-property-set? (#PCDATA|%inline;|%block;)");