diff options
| author | Adrian Cumiskey <acumiskey@apache.org> | 2008-07-04 13:21:43 +0000 |
|---|---|---|
| committer | Adrian Cumiskey <acumiskey@apache.org> | 2008-07-04 13:21:43 +0000 |
| commit | d5fb8b71ba22f39d1e5e311104e8a47d597bc214 (patch) | |
| tree | dd2f6d53c83598ff86f978117695cb0c28ceff81 | |
| parent | d6ddcca1a6c97de39c9c68fd000550a31da6e46c (diff) | |
| download | xmlgraphics-fop-d5fb8b71ba22f39d1e5e311104e8a47d597bc214.tar.gz xmlgraphics-fop-d5fb8b71ba22f39d1e5e311104e8a47d597bc214.zip | |
Merged revisions 672833,674039,674043 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r672833 | adelmelle | 2008-06-30 18:34:41 +0100 (Mon, 30 Jun 2008) | 2 lines
Added check for the case where column-number is specified on something other than a fo:table-cell or fo:table-column (strictly not an error)
........
r674039 | acumiskey | 2008-07-04 14:13:29 +0100 (Fri, 04 Jul 2008) | 2 lines
Minor readability improvement.
........
r674043 | acumiskey | 2008-07-04 14:17:06 +0100 (Fri, 04 Jul 2008) | 3 lines
The pdf StringBuffer is only used on these two lines and doesn't seem to do anything...
Very strange... :-S
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@674045 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/render/pdf/PDFRenderer.java | 3 | ||||
| -rw-r--r-- | test/fotree/testcases/column-number_cells_rows.fo | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index eae961e9b..0723d62f0 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -1415,7 +1415,6 @@ public class PDFRenderer extends AbstractPathOrientedRenderer { updateColor(ct, true); beginTextObject(); - StringBuffer pdf = new StringBuffer(); String fontName = getInternalFontNameForArea(text); int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue(); @@ -1434,8 +1433,6 @@ public class PDFRenderer extends AbstractPathOrientedRenderer { textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f)); - currentStream.add(pdf.toString()); - super.renderText(text); textutil.writeTJ(); diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo index 2d48e8ceb..90486d5fb 100644 --- a/test/fotree/testcases/column-number_cells_rows.fo +++ b/test/fotree/testcases/column-number_cells_rows.fo @@ -181,6 +181,10 @@ </fo:table-row> </fo:table-body> </fo:table> + <fo:block column-number="4"> + <test:assert property="column-number" expected="4" /> + Test column-number when specified on fo:block + </fo:block> </fo:flow> </fo:page-sequence> </fo:root> |