PR:

Obtained from:
Submitted by:
Reviewed by:
Rolled the PageNumberGenerator from PSLM back into PageSequence (slightly simpler, also this functionality is useful for non-layout render types), renamed PageViewport.getPageNumber() to .getPageNumberString() to emphasize what it is actually returning.


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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java
index 52c433b9d..fbe7a9984 100644
--- a/src/java/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/java/org/apache/fop/render/ps/PSRenderer.java
@@ -357,7 +357,7 @@ public class PSRenderer extends PrintRenderer {
 
         this.currentPageNumber++;
         gen.writeDSCComment(DSCConstants.PAGE, new Object[]
-                {page.getPageNumber(),
+                {page.getPageNumberString(),
                  new Integer(this.currentPageNumber)});
         final Integer zero = new Integer(0);
         final long pagewidth = Math.round(page.getViewArea().getWidth());
diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index ab1e20d74..4a2e54cf1 100644
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -338,7 +338,7 @@ public class XMLRenderer extends AbstractRenderer {
     public void renderPage(PageViewport page) throws IOException, FOPException {
         atts.clear();
         addAttribute("bounds", page.getViewArea());
-        addAttribute("nr", page.getPageNumber());
+        addAttribute("nr", page.getPageNumberString());
         startElement("pageViewport", atts);
         startElement("page");
         super.renderPage(page);