You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/10 13:56:42 UTC
svn commit: r231213 - in /xmlgraphics/fop/trunk:
examples/fo/pagination/allregions.fo
src/java/org/apache/fop/area/RegionReference.java
Author: jeremias
Date: Wed Aug 10 04:56:35 2005
New Revision: 231213
URL: http://svn.apache.org/viewcvs?rev=231213&view=rev
Log:
Bugzilla #36112
Fix for Java2DRenderer to paint regions other than region-body. Area tree was not properly cloned.
Submitted by: Richard Wheeldon <richardw.at.geoquip-rnd.demon.co.uk>
Modified:
xmlgraphics/fop/trunk/examples/fo/pagination/allregions.fo
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
Modified: xmlgraphics/fop/trunk/examples/fo/pagination/allregions.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/pagination/allregions.fo?rev=231213&r1=231212&r2=231213&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/pagination/allregions.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/pagination/allregions.fo Wed Aug 10 04:56:35 2005
@@ -39,6 +39,15 @@
</fo:block>
</fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block text-align="center"
+ font-size="10pt"
+ font-family="serif"
+ line-height="14pt" >
+ After
+ </fo:block>
+ </fo:static-content>
+
<fo:static-content flow-name="xsl-region-start">
<fo:block-container border-color="black" border-style="solid" border-width="1pt"
height="22.2cm" width="1cm" top="0cm" left="0cm" position="absolute">
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java?rev=231213&r1=231212&r2=231213&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java Wed Aug 10 04:56:35 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 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.
@@ -29,12 +29,14 @@
* so the page master can make copies from the original page and regions.
*/
public class RegionReference extends Area implements Cloneable {
+
+ /** Reference to the region FO. */
protected Region regionFO;
private CTM ctm;
// the list of block areas from the static flow
- private List blocks = new ArrayList();
+ private ArrayList blocks = new ArrayList();
// the parent RegionViewport for this object
protected RegionViewport regionViewport;
@@ -109,7 +111,6 @@
/**
* Clone this region.
* This is used when cloning the page by the page master.
- * The blocks are not copied since the master will have no blocks.
*
* @return a copy of this region reference area
*/
@@ -117,6 +118,7 @@
RegionReference rr = new RegionReference(regionFO, regionViewport);
rr.ctm = ctm;
rr.setIPD(getIPD());
+ rr.blocks = (ArrayList)blocks.clone();
return rr;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org