xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acumis...@apache.org
Subject svn commit: r674045 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/render/pdf/PDFRenderer.java test/fotree/testcases/column-number_cells_rows.fo
Date Fri, 04 Jul 2008 13:21:43 GMT
Author: acumiskey
Date: Fri Jul  4 06:21:43 2008
New Revision: 674045

URL: http://svn.apache.org/viewvc?rev=674045&view=rev
Log:
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
........

Modified:
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/   (props changed)
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo

Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul  4 06:21:43 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-672776
+/xmlgraphics/fop/trunk:1-674043

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=674045&r1=674044&r2=674045&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Fri Jul  4 06:21:43 2008
@@ -1415,7 +1415,6 @@
         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 @@
 
         textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f));
 
-        currentStream.add(pdf.toString());
-
         super.renderText(text);
 
         textutil.writeTJ();

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo?rev=674045&r1=674044&r2=674045&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo
Fri Jul  4 06:21:43 2008
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message