1 files changed, 13 insertions, 1 deletions
diff --git a/src/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
index ddc85d327..98a17de0b 100644
--- a/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
+++ b/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
@@ -7,13 +7,18 @@
 
 package org.apache.fop.area.inline;
 
+import org.apache.fop.area.PageViewport;
+import org.apache.fop.area.Resolveable;
+
 import java.util.ArrayList;
 
-public class UnresolvedPageNumber extends Unresolved {
+public class UnresolvedPageNumber extends Word implements Resolveable {
+    boolean resolved = false;
     String pageRefId;
 
     public UnresolvedPageNumber(String id) {
         pageRefId = id;
+        word = "?";
     }
 
     public String[] getIDs() {
@@ -22,5 +27,12 @@ public class UnresolvedPageNumber extends Unresolved {
 
     public void resolve(String id, ArrayList pages) {
         resolved = true;
+        PageViewport page = (PageViewport)pages.get(0);
+        String str = page.getPageNumber();
+        word = str;
+    }
+
+    public boolean isResolved() {
+       return resolved;
     }
 }