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/11/11 18:27:20 UTC

svn commit: r332614 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java

Author: jeremias
Date: Fri Nov 11 09:27:17 2005
New Revision: 332614

URL: http://svn.apache.org/viewcvs?rev=332614&view=rev
Log:
Bugzilla #37468:
Placement of flows in multi-column documents was wrong. The area tree is correct, however. Bug in AbstractRenderer. Simpler is sometimes better.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=332614&r1=332613&r2=332614&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Fri Nov 11 09:27:17 2005
@@ -379,9 +379,6 @@
         int saveSpanBPPos = saveBPPos;
         for (int count = 0; count < spans.size(); count++) {
             span = (Span) spans.get(count);
-            int offset = (mr.getWidth()
-                    - (mr.getColumnCount() - 1) * mr.getColumnGap())
-                    / mr.getColumnCount() + mr.getColumnGap();
             for (int c = 0; c < span.getColumnCount(); c++) {
                 NormalFlow flow = (NormalFlow) span.getNormalFlow(c);
 
@@ -389,7 +386,7 @@
                     currentBPPosition = saveSpanBPPos;
                     renderFlow(flow);
                     currentIPPosition += flow.getIPD();
-                    currentIPPosition += offset;
+                    currentIPPosition += mr.getColumnGap();
                 }
             }
             currentIPPosition = saveIPPos;



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